get rid of servlet 2.5 dependency

Only user left was OSGI and Thomas has no objections with upgrading this to 3.1