merge in oc-release history after reset to oc-dev
gitbuildkicker [Fri, 5 May 2017 20:48:04 +0000 (13:48 -0700)]

Trivial merge