Merge "Revert "Added a new test for whitelist of VMS clients"" into pi-dev