Merge pull request #1160 from op-jenkins/op-build-update_945_6-16-2017

op-build update 6-16-2017