lint fixes
lint fixes
Merge branch 'lxc_refactor' into develop