Merge pull request #1158 from op-jenkins/op-build-update_1734_6-15-2017

op-build update 6-15-2017