USERGRID-2468: fixed Spring class loading issues resulting from merge
USERGRID-2468: fixed Spring class loading issues resulting from merge