Merge "BUG-2626: Do not override enunciate version"