Apply tilematrix set fix to release branch
Merge pull request #1073 from geoadmin/gjn_tilematrix_releasebranch

Apply tilematrix set fix to release branch