Merge "BUG-2626: activate enunciate only on jdk-1.7"