merge in oc-release history after reset to oc-dev
gitbuildkicker [Sat, 6 May 2017 02:29:06 +0000 (19:29 -0700)]

Trivial merge