CAMEL-7080 Fixed JDK6 build and unit test error