Issue #2735981 by MegaChriz: Fixed failing branch tests due to new "administer fields" permission (see also change record #2483307).