Cleanup of Group Policy Redirect Action

Fixing the cleanup logic for Redirect Action

Change-Id: I7ab31d04e97a11c1c2bf649677cc206900b96bf2
closes-bug:1388236
Merge "Cleanup of Group Policy Redirect Action"