Updated from global requirements

Change-Id: I4fbb6e8113bfc52403caba985c65212577cb4633
Adds a whitelist for endpoint catalog substitution

Change-Id: If02327d70d0143d805969fe927898f08eb84c4c2
Closes-Bug: #1354208
Merge "Updated from global requirements" into stable/havana
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana