os-436 Adapted setup_hiera to more flexible gen_hierarchy script.
os-436 Adapted setup_hiera to more flexible gen_hierarchy script.

syseleven/bootstrap-scripts,autostrap/bootstrap-scripts,autostrap/bootstrap-scripts,syseleven/bootstrap-scripts,syseleven/bootstrap-scripts,autostrap/bootstrap-scripts