Merge "Exclude non-permission entries from getAllPermissions()" into pi-dev