Merge remote-tracking branch 'immerda/master' into merge_immerda

Conflicts:
	manifests/plugins/interfaces.pp

$real_ifs was changed on master and we'd like to keep that change

$ifs was changed to use the prefix() function and we'd like to keep that
change.