(Workinprogress) Icehouse release megapatch

All the things.

Change-Id: I9576fcb221655e94a67893f6a928c165915159a1

Conflicts:
	contrib/aptira/puppet/user.yaml
	data/data_mappings/scenario/stacktira.yaml
	data/hiera_data/user.stacktira.yaml