Merge remote-tracking branch 'steven/master'

conf/type/__apt_ppa/manifest

@@ -27,4 +27,4 @@ require="__package/python-software-properties" \
    --source "$__type/files/remove-apt-repository" \
    --mode 0755
 
-require="$__self" __apt_update_index
+require="$__object_name" __apt_update_index

conf/type/__autofs_map/manifest

@@ -38,5 +38,5 @@ if [ -f "$__object/parameter/comment" ]; then
 fi
 echo "$entry" >> "$__object/parameter/entry"
 
-require="$__self" __autofs_master
+require="$__object_name" __autofs_master
 

conf/type/__autofs_master/manifest

@@ -24,7 +24,7 @@ if [ ! -f "$__object/parameter/header" ]; then
 fi
 
 [ -d "$__object/files" ] || mkdir "$__object/files"
-require="$__self" __file /etc/auto.master --source "$__object/files/auto.master" \
+require="$__object_name" __file /etc/auto.master --source "$__object/files/auto.master" \
    --mode 644 \
    --owner root \
    --group root

conf/type/__package/manifest

@@ -49,4 +49,4 @@ for property in $(ls .); do
    fi
 done
 
-require="$__self" __package_$type "$@"
+require="$__object_name" __package_$type "$@"

conf/type/__partition_msdos/manifest

@@ -38,4 +38,4 @@ if [ ! -f "$__object/parameter/size" ]; then
 fi
 
 # pull in the type that actually does something with the above parameters
-require="$__self" __partition_msdos_apply
+require="$__object_name" __partition_msdos_apply