Added serialVersionUID
Merge pull request #1646 from pveentjer/coverage/idgenerator

Coverage/idgenerator
Merge pull request #1647 from pveentjer/cleanup/serialVersionUID

Added serialVersionUID
Merge pull request #1649 from pveentjer/cleanup/stringencoding

Fixed a lot of findbugs issues with string encoding
Initial work on lock cleanup
Cleanup lock