Spring upgrade issue - ClassNotFoundException