XD-1394: Upgrade to spring 4.0.2