XNO-19286 - DB lock issues while cleaning the feeds
Merge branch 'master' of github.com:ning/collector