Large merge, should have working i2cat and ubris OF rspecs