Merge "init: use init's property expansion code for mount_all"