Merge "Adds QUERY_ALL_PACKAGES permission to rollbacktest"