Cope with old selections documents without a from-feed attribute
Merge branch 'b2.5'
Migrated more unit-tests

Note that testSelections and testSelectionsWithFeed were identical,
since we always download any missing feeds now.