Merge pull request #1090 from op-jenkins/op-build-update_1024_5-18-2017

op-build update 5-18-2017