Merge pull request #808 from op-jenkins/op_update_05_1-13-2017

op-build update 1-13-2017