Revert "keep cmake in sync with automake related to default bus addresses"