merge in oc-release history after reset to master
gitbuildkicker [Mon, 13 Feb 2017 18:28:51 +0000 (10:28 -0800)]

Trivial merge