Merge "Introduce role-specific NodeUserData, use for docker"