v5.18

Change behaviour of provide with data in the DB

Previously we returned the DB data in preference to
provided data. We now always return provided data
if a provider exists for the path.