Fix more classpath issues: use o.a.velocity bundle instead of Import-Package