Named Query resolution based on configured database type
Merge remote-tracking branch 'origin/master' into database-type-selector
Merge branch 'database-type-selector' of https://github.com/alanraison/substeps-database into alanraison-database-type-selector

Conflicts:
	src/test/resources/features/namedQueries.feature
	src/test/resources/named-queries.properties
Merge branch 'master' of https://github.com/technophobia/substeps-database

Conflicts:
	src/test/resources/localhost.properties