Merge pull request #685 from wghoffa/tpm

op-build update 10-10-2016 am