Adds a whitelist for endpoint catalog substitution

Change-Id: If02327d70d0143d805969fe927898f08eb84c4c2
Closes-Bug: #1354208
Merge remote-tracking branch 'upstream/stable/icehouse' into stable/icehouse