Merge proposals dependent on lp://staging/~dreis-pt/openobject-extension/base_external_dbsource-v7

1. base_external_dbsource-v7
2. Dependent merge proposals