Merge pull request #1113 from op-jenkins/op-build-update_05_5-30-2017

op-build update 5-30-2017