Merge pull request #1884 from op-jenkins/op-build-update_815_2-19-2018

op-build update 2-19-2018