merge in oc-release history after reset to oc-dev
gitbuildkicker [Thu, 4 May 2017 07:08:09 +0000 (00:08 -0700)]

Trivial merge