[WAGON-510] Upgrade parent to 31

Also resolve issues and todos which came along with version 31.
2 files changed