Merge "Add artifacts needed for Gradle 2.1" into idea133-milestone