Merge pull request #1047 from op-jenkins/op-build-update_05_4-28-2017

op-build update 4-28-2017