A variety of fixes to ensure that end-to-end use-case works using the ip whitelist policy