Merge branch 'develop'
enable_root_user option added to service_params list

enable_root_user option added to service_params list