Merge pull request #1109 from op-jenkins/op-build-update_820_5-25-2017

op-build update 5-25-2017