Don't map controller_hostname to an IP address

The current data mappings set coe::base::controller_hostname
to an IP address.  This results in an invalid entry in
/etc/hosts containing two IP addresses rather than an IP address
and a hostname.  The problem doesn't affect the full_ha
scenario as it overrides the setting in user.full_ha.yaml.  This
patch removes the broken mapping and adds a similar config to
user.common.yaml, resulting in a clean /etc/hosts file.

Change-Id: Ibdb436ce0f5d08fd6acbadebc7323ac374a46207
Partial-Bug: #1274263
apt-get dist-upgrade needed after adding repos

apt-get dist-upgrade is needed after adding a vendor repo to ensure
that any packages in the vendor repo which need to override "baseline"
packages get in place.

Change-Id: Id70ff9200ce0a19cf4900eaafda5bb3c8c5ee480
Partial-Bug: #1273777
Add a bunch of inline documentation

Users of puppet_openstack_builder are often befuddled by the lack
of inline data in the files they are most commonly expected to
modify (e.g. the user.x.yaml files where things like hostnames,
IP addresses, and passwords are typicall entered).  This patch
provides inline documentation to make the files less mysterious
to new users.

Change-Id: I1ece3c968dfc74ff7fd636ef1c0bf9e67d567a41
Partial-Bug: #1270381
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder into coi-development

Conflicts:
	data/hiera_data/user.common.yaml