Merge pull request #1040 from op-jenkins/op-build-update_176_4-24-2017

op-build update 4-24-2017