Adds timeout error
Uses https for requesting mapbox tiles
Merge remote-tracking branch 'origin/fix/CDB-1099' into release/2.5.4