Fixing test and polished.
Fixed test

Conflicts:
	components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
Fixed test
Fixed test
Fixed test on CI servers