Merge changes from topic "featureIdCleanup"

* changes:
  Do not allow invalid attribution tags
  Remove legacy support for "featureId".