Continue the work on the lxc refactor, upgrades & fixes

Conflicts:
	salt/modules/lxc.py