Upgrade Groovy version to 2.3.6.

+review
Add missing edits to spec.

+review REVIEW-5046