Simplify specification of EE license/plan features

Merged Douwe Maan requested to merge dm-license-features into master