[1.6.x] Corrected setting name in gis test error message.

e36c165b14 from master.
[1.6.x] Fixed #21562 -- Warned against using the same app name as a django contrib app.

Thanks yourcelf for the report.

Backport of 317fd13c7a from master