Merge pull request #3208 from op-jenkins/op-build-update_1232_10-11-2019

op-build update 10-11-2019