Merge "sort deploy and undeploy policy lists"