Merge branch '21.1-dev-new' into '21.1-dev'

Fix multiplot panel offsets and line styles

See merge request atlas/athena!11403

(cherry picked from commit 336b878e [formerly 5de1ac9033430d9391cb4474c44dc5465b114899])

61720442 Fix multiplot panel offsets and line styles
0b9e6688 Fix x error bars and remove printout
3057fb70 Remove compile warnings

Former-commit-id: 2af281759a85d428eab5fc9ad04548cb0de7f2e9