Merge pull request #1025 from op-jenkins/op-build-update_05_4-17-2017

op-build update 4-17-2017