Bug 3622: Allow empty (non-null) getGatewayPortId and tenantId values for router