Calculating the attribute sizes correctly based on whether the attributes...

Calculating the attribute sizes correctly based on whether the attributes being enabled are either singleton or external
JIRA: ZAPP-783