Merge changes I2b711317,I42e18339

* changes:
  SF: Do not abort on duplicate hotplug disconnect
  SF: Extract processHotplug from configureLocked