added ability to only stopAdvertising and to disconnect a central
manual merge