Merge pull request #1079 from op-jenkins/op-build-update_1242_5-15-2017

op-build update 5-15-2017