add support for different feed classes in manager
Merge remote-tracking branch 'origin/cassandra' into cassandra