Merge pull request #1015 from op-jenkins/op-build-update_1517_4-8-2017

op-build update 4-8-2017