See bug #803955

This does mean that $OVERRIDDEN will also get a list of database fields and
plugins, but I think that more fields, is better than too few.

Change-Id: I3fef6277484e48d5ec4c1609fbe1178f976333f6
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>