Update message if we can't connect to the local database (because we're running the grabber as a standalone.
Merge remote-tracking branch 'origin/API-20140530' into API-20140530