Continue the work on the lxc refactor, upgrades & fixes

Conflicts:
	salt/modules/lxc.py
fix lxc cloud_init interface
fix lxc cloud_init interface
Merge branch 'lxc_refactor' into develop