Merge "Remove xtend.version property"