Code review
Fix test failures in the TMS imagery provider.

The failures were introduced with pull request #364.
Merge pull request #421 from AnalyticalGraphicsInc/fixTmsTestFailures

Fix test failures in the TMS imagery provider.
Merge part of pull request #387 from vicb/review2

Code review
Merge remote-tracking branch 'origin/master' into toIso8601