This should fix the backwards compatibility breakage. Missed in my testing because I had a pre-existing pillar setup (from an old way I did tablespace support).
Move this formula to the new style map.jinja. Still need to sort out RedHat handling, but it's not any worse than it was before (i.e. horribly broken)