Revert "Use equals instead of startsWith to ensure that the correct field is overridden when computing metadata overrides. Resolves #216"

This reverts commit b2d1cfa5e4e39cb478ba4db4981736709302f117.
Merge branch 'BroadleafCommerce-3.0.x' into develop