PEP8 fix
Fixes for failing tests on jenkins
Resolved merge conflicts
Update checksums for map test
Merge pull request #1418 from timlinux/develop

Test fixes for 2.2 release