Revert "Merge "Bug 6235 - Cookie compare in FlowRegistryKeyFactory""