DMPT - added config for country lookup class.
Merge branch 'post-1.6'