Merge "Remove deprecated patrole.enable_rbac configuration option"