Add user preference and example CLI to build it

Add a user preference class to collect user service preferences.

Sorry for all the test changes.  I wanted to make the v2 and v3
tests have the same service catalog in a different format so that
the normalize catalog would be the same for both.

Closes-Bug: #1353030

Change-Id: Ice4e606255533425be7559916f083b4171566502
Merge "Add user preference and example CLI to build it"