Merge pull request #2061 from op-jenkins/op-build-update_043_4-24-2018

op-build update 4-24-2018