Merge proposals dependent on lp://staging/~mikel-martin/openobject-server/6.1-fix-dbfilter-ignored-in-config-file

lp://staging/~mikel-martin/openobject-server/6.1-fix-dbfilter-ignored-in-config-file has no merge proposals.