merge in oc-release history after reset to master
gitbuildkicker [Tue, 21 Mar 2017 07:06:33 +0000 (00:06 -0700)]

Trivial merge