Merge "Improved dump of whitelisted packages per user."