Merge "Package /data instead of userdata.img in sdk images" into pi-dev