lbuild-initvm .sh: add option -i image - to specify the location of the rootfs
Merge remote-tracking branch 'upstream/master'