Finish adding help strings to all config options in Quantum code.

This adds reasonable help strings to all remaining config options
in Quantum code. This includes all the plugins as well.

Fixes bug 1101356

Change-Id: I1cbe8303ad6d86756b992ae302707a0365625f52
Fix branch in db migration scripts

Fixes bug #1108781

Change-Id: Ia6cfcc4a1cc39136bad99be26f40aac9fa3e3e70
Merge "Finish adding help strings to all config options in Quantum code."
Merge "Fix branch in db migration scripts"