Merge pull request #556 from s0undt3ch/develop

Bump to `bootstrap-salt.sh` v1.5.4
When loading a map, enforce a know data format.

* Simplified some code logic.
* Any additional data defined on the map, overrides the profile data.