merge in oc-release history after reset to master
gitbuildkicker [Tue, 14 Mar 2017 01:36:18 +0000 (18:36 -0700)]

Trivial merge