ENTESB-802 - update to latest spring 3.1