merge in oc-release history after reset to oc-dev
gitbuildkicker [Fri, 5 May 2017 14:21:47 +0000 (07:21 -0700)]

Trivial merge