INT-3133-2: PAs Inheritance Refactoring

JIRA: https://jira.springsource.org/browse/INT-3133

INT-3133-2: Addressing PR's comments