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

Trivial merge