GRADLE-2932 - Incremented the cache layout version.

- Simplified CacheLayout.
- Changed GradleDistribution fixture to use a VersionNumber to represent the cache layout, instead of an integer.
Don't run this test against 1.9-rc-1
Merge branch 'release'