Merge pull request #1218 from sannerd/fixup.op.hb.patches.try3

Bump up HB, adjust OCC patches and fix HDAT I2C