merge in oc-release history after reset to oc-dev
gitbuildkicker [Sat, 6 May 2017 01:17:38 +0000 (18:17 -0700)]

Trivial merge