Revert "lxc refactor"
Merge pull request #14165 from saltstack/revert-14137-lxc

Revert "lxc refactor"