Merge "weston-init: Ensure setting of the user"