Merge pull request #819 from op-jenkins/op_update_855_1-18-2017

op-build update 1-18-2017