Changes to reflect cluster configuration and upgrade to Spring 3.2.5