Merge changes from topic "tp-master-security"

* changes:
  Remove APN db reading loophole
  Revert "DO NOT MERGE Check access to user and password fields in APN db"
  Revert "DO NOT MERGE Examine sort field for sensitive fields"
  Revert "DO NOT MERGE Fix the remaining holes for access to APN data"
  DO NOT MERGE Fix the remaining holes for access to APN data