merge in oc-release history after reset to master
gitbuildkicker [Sun, 19 Mar 2017 07:10:10 +0000 (00:10 -0700)]

Trivial merge