In MappedElementImpl#updateRecord, when iterating over mapped attributes, check to see if a mapped attribute's mapped feature's attribute type is FeatureMapEntry. If it is, get the value that would be set by MappedAttributeImpl#updateRecord, and add that as text to the object's "mixed" structural feature -- instead of trying to use MappedAttribute#updateRecord to set it.
Filter FeatureMapEntry attributes *not* named "mixed" from the list returned by MappedModelUtil.getAttributes
Handle default values for "mixed" attributes. This bypasses EcoreUtil.convertToString when setting the default value if the value is already an instance of String, and uses the same hack/assumption that toString can be called on the default value when the type of a mapped attribute's mapped feature is FeatureMapEntry.
Merge branch 'master' into handle-mixed-attribute

Conflicts:
	crosswalk-gmf/src/crosswalk/impl/MappedAttributeImpl.java
Remove toString() call since getDefaultValue() returns a String
In MappedAttributeImpl#getValue, obtain the default setting consistently. If the setting turned out to be blank, we want to make sure we handle the feature map entry case.
Add comments
Merge branch 'handle-mixed-attribute'