Merge pull request #1041 from op-jenkins/op-build-update_05_4-26-2017

op-build update 4-26-2017