Fix make distrib
Note roles in FEATURES
Merge branch 'maint'

* maint:
  Fix make distrib
Merge branch '39-dynamic-roles' into next

* 39-dynamic-roles:
  Note roles in FEATURES
Merge branch 'master' into next

* master:
  Fix make distrib