branch can be found here https://github.com/dimitraz/aerogear-unifiedpush-server/tree/router-streams

PR to follow