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

Trivial merge