Merge "add ut getServiceToscaModel rethrow Exception"