Merge pull request #2935 from op-jenkins/op-build-update_223_6-12-2019

op-build update 6-12-2019