Added org.apache.velocity 1.7 as an OSGi bundle
Fix compilation issues with Velocity 1.7
Move to Kepler