Merge pull request #1533 from op-jenkins/op-build-update_229_10-6-2017

op-build update 10-6-2017