Merge pull request #2895 from op-jenkins/op-build-update_254_5-23-2019

op-build update 5-23-2019