Make the Analytics comp surviving when an external db is down.
Merge pull request #3996 from HassenRiahi/MakeAnalyticsCompMoreRobust

Make the Analytics comp surviving when the external db is down.