Fix version.org.uberfire problem (of bad merge)