Fix the Add REST Service flow: SOAP-536