/etc/hosts: sort entries by lxc_host name, then container name
Merge branch 'parsestash'