merge in oc-release history after reset to master
gitbuildkicker [Wed, 1 Mar 2017 08:09:08 +0000 (00:09 -0800)]

Trivial merge