Fix to configure separate endpoint and bind addresses

Allow separate endpoint and bind addresses for orchestration.
Update tests.

Change-Id: I216e7973b8114e85928cd69db326e2b52784a7c3
Closes-Bug: #1317646
Merge "Fix to configure separate endpoint and bind addresses"