Account for different interfaces in lxc
diff interface for lxc
remove hiera.yaml as hiera_config only allows one per master restart anyway.
Merge branch 'dev' into staging
Merge branch 'staging' into production