Corrections on issues #1752, #1743 and factorisation of localised map/scale file search
Comments and example provided
Merge pull request #1753 from clinique/mycorrections

Fixes for #1752, #1743 (NPE in PersistenceExtensions) and Factorisation of localised map/scale file search