Merge remote-tracking branch 'origin/release/19.12'
- Conflicts:
- CMakeLists.txt
- umbrello/codegenerators/cpp/cppcodegenerationform.cpp
- umbrello/codegenerators/cpp/cppcodegenerationform.h
- umbrello/codegenerators/cpp/cppcodegenerationpolicypage.cpp
- umbrello/codegenerators/cpp/cppwriter.cpp