Moved populate_maplayers, adjusted import statement in tests.py.
Merge pull request #1640 from brylie/master

Moved populate_maplayers, adjusted import statement in tests.py. Fixes  #1473
fixed a few license layout issues
Merge pull request #1641 from state-hiu/licenses_minor_fix_2

License Layout Fix