Port of project_service_type to 7.0

vimline to remove