Fix #1606 & #1712 Homepage does not display when deleting a feed
Merge pull request #1010 from nlegoff/fix-homepage-feed

[Ready][3.8] Fix #1606 & #1712 Homepage does not display when deleting a feed
Merge branch '3.8'

Conflicts:
	lib/classes/Feed/Collection.php
	tests/classes/Feed/Feed_CollectionTest.php