Merge pull request #1220 from stewart-ibm/fix-romulus

Revert "Bump up HB, adjust OCC patches and fix HDAT I2C"