GRADLE-2171 Restore imports lost while merging conflicts
GRADLE-2171 Change case of DuplicatesStrategy enumeration so that Gradle can automatically coerce strings to enum types.