Merge pull request #1202 from op-jenkins/op-build-update_957_6-29-2017

op-build update 6-29-2017