Next round (#6) of get/set mods: remove Component.getAttributes() and AttributSet from the public API

            @rev jbuchanan@
            @work W-2043302@
Merge branch 'master' into dchasman/master-pending-haloGetSetRound5
Next round (#6) of get/set mods: remove Component.getAttributes() and AttributSet from the public API

- fixed issue with AttributeSet.merge() usage

                @rev jbuchanan@
                @work W-2043302@
Merging origin/dchasman/master-pending-haloGetSetRound6 into master