Merge pull request #1112 from op-jenkins/op-build-update_856_5-26-2017

op-build update 5-26-2017