ISPN-4516 Added Spring 4 support