Fix double navajo.resource.* prefix for non-multitenant datasources.
Merge branch 'master' of git@github.com:Dexels/navajo.git