fix small issues found by @myii

salt/map.jinja

@@ -11,11 +11,11 @@
 
 {# merge the osfamilymap #}
 {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
-{% do defaults.salt.update(osfamily) %}
+{% do salt['defaults.merge'](defaults['salt'], osfamily) %}
 
 {# merge the osmap #}
 {% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %}
-{% do defaults.salt.update(osmap) %}
+{% do salt['defaults.merge'](defaults['salt'], osmap) %}
 
 {## Merge in salt pillar ##}
 {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}

salt/osmap.yaml

@@ -22,7 +22,7 @@ Ubuntu:
       install_from_source: False
       git:
         require_state: False
-        install_from_package: None
+        install_from_package: Null
 
 Raspbian:
   pkgrepo: 'deb http://repo.saltstack.com/apt/{{ os_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'