INT-3133-2: PAs inheritance refactoring

JIRA: https://jira.springsource.org/browse/INT-3133
INT-3133-2: Addressing PR's comments