merge in oc-release history after reset to 0bf0e132b4c53e6679f4eb383f2e40f8db4698f5
gitbuildkicker [Thu, 23 Mar 2017 00:14:20 +0000 (17:14 -0700)]

Trivial merge