Merge branch 'develop' into character-selection

Pull all the Maven reconfiguration and other fixes into the character-selection branch to allow CI builds of the character-selection branch.