Merge branch 'release/2.1.2' into development
Use Unix file locks for locking, not lockfile module.
Filelock code moved to utils; lockfile removed from requirements.
New version number.
Merge branch 'feature/ticket9320_lock_problems' into development
Small corrections to documentation.
Add release notes.
Merge branch 'release/2.2.0'