fixed when execute a query without the_geom_webmercator styles are not properly reset CDB-568
Merge remote-tracking branch 'origin/feature/CDB-568' into release/2.1.5
Fixed: when execute a query without the_geom_webmercator styles are not properly reset