Merge pull request #1234 from op-jenkins/op-build-update_544_7-11-2017

op-build update 7-11-2017