Merge branch 'rh' into 'master'

move python yaml library to map.jinja to do support by OS

See merge request !6