Ability to override listen and port

Change-Id: I21337d6267ba9ec1a48b873eecf9ae26be4a9ad6