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

Trivial merge