Merge pull request #1200 from op-jenkins/op-build-update_025_6-29-2017

op-build update 6-29-2017