Use Java 7 idioms.
TAVSERV-337: Ensure that the RMI registry is started before the overall
service becomes available.
Bump the version numbers.
Merge branch 'experimental/input-delimiter' into 2.5-branch
Merge branch '2.5-branch' into experimental/java7
Use JSR 305 nullability assertions instead of findbugs ones.