Merged in changes from cate-development branch and upgraded to spring 3.0.0.RC1