Merge pull request #20837 from colemanw/customACLs

 Distinguish custom field VIEW from EDIT permissions

diff --cc CRM/Contribute/Form/ContributionView.php
Simple merge

diff --cc CRM/Contribute/Page/ContributionRecur.php
Simple merge

diff --cc CRM/Core/BAO/Address.php
Simple merge

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc tests/phpunit/api/v3/ACLPermissionTest.php
Simple merge