Rebuild collection/endpoint management

.

(from redmine: issue id 497, created on 2018-01-22tgradl, closed on 2018-01-24)

• Relations:
  • relates #496