Use Java 7 idioms.
Merge branch '2.5-branch' into experimental/java7
Use JSR 305 nullability assertions instead of findbugs ones.
Merge branch 'experimental/java7' into 2.5-branch