Merge pull request #1198 from op-jenkins/op-build-update_83_6-28-2017

op-build update 6-28-2017