XWIKI-22412 is not enough and other changes were made as part of XWIKI-21211 (which have nothing to do with the docker image).