Merge "Rework nova service_user section"