Add liblzma for xz. Refs #126
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rootfs/Dockerfile