Establishing compatibility to latest source release of caliper.

@Benchmark annotations still have to be added to these classes.