Merge pull request #1950 from brauner/2017-11-27/criu_fixes

bugfixes

diff --cc src/lxc/conf.c
Simple merge

diff --cc src/lxc/conf.h
Simple merge

diff --cc src/lxc/confile.c
Simple merge

diff --cc src/lxc/criu.c
Simple merge

diff --cc src/lxc/lxccontainer.c
Simple merge

diff --cc src/lxc/storage/overlay.c
Simple merge

diff --cc src/lxc/storage/rsync.c
Simple merge

diff --cc src/lxc/utils.c
Simple merge

diff --cc src/lxc/utils.h
Simple merge