Merge pull request #1700 from op-jenkins/op-build-update_1458_12-11-2017

op-build update 12-11-2017