Merge pull request #1206 from op-jenkins/op-build-update_025_6-30-2017

op-build update 6-30-2017