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

Trivial merge