remove duplicated applications and better ordering
Merge branch 'jag/poc-traffic-control' of github.com:Zentyal/zentyal into poc-traffic-control