merge in oc-release history after reset to master
gitbuildkicker [Thu, 23 Mar 2017 04:23:09 +0000 (21:23 -0700)]

Trivial merge