CDAP-538: Updated order of services in the scripts.