Merge "Improve is_admin support in Patrole converter framework."