merged 5.0 (traditional vserver-based) and 5.1 (aka lxc_devel)