Merge pull request #1083 from op-jenkins/op-build-update_05_5-16-2017

op-build update 5-16-2017