Merge pull request #5003 from sartura/lxc_bump_to_2.1.1