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

Trivial merge