Changes for Cluster installation: Hostname etc.
Merge origin/release/uni-hd into feature/generator-update

Conflicts:
	generator/profile/UIDefinition.xml