PLXCOMP-220 (Part I): changes to attribute merging

Bug fix to a regression caused by recent changes in the way resource attributes were merged. Please see JIRA ticket for detailed analysis.