merge in oc-release history after reset to 26dd90319b4e199c0ff940a5eeb52b678caaa3b8
gitbuildkicker [Tue, 14 Mar 2017 00:15:59 +0000 (17:15 -0700)]

Trivial merge