Bug2810

Pull request 725 rebased and resubmitted. All commits are relevant to the idea of not outputting deceiving error messages during bootstrap. It's split in small commits since they compile individually, so bisecting is easy. Please merge only in master, it affects failsafe policy so we need to test it for some time.