CB-3: Changed spring and servlet-api version for collaboration