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

Trivial merge