Bugfixes from LXC refactor
Bugfixes from LXC refactor

Also reclassify the new functionality as being added for the Lithium
release

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt