Merge branch 'Bonding-fixes-for-Ocelot-switch'