Fix lookup of vendor subtype's. Set name for service element types to top
level subtype.
Merge remote-tracking branch 'origin/development' into development