Update to build with Sakai 10

Startup failure on 10.x, looks like related to RSF:

2014-05-20 10:43:51,525 INFO localhost-startStop-1 org.sakaiproject.util.ToolListener - registering tools from resource: /tools/sakai.qna.xml
[0] new thread Thread[localhost-startStop-1,5,main] detected by Logger with name localhost-startStop-1
[0] MethodAnalyser found 1 setattr methods for class uk.org.ponder.saxalizer.mapping.SAXalizerMapperEntry
[0] MethodAnalyser found 3 setattr methods for class uk.org.ponder.saxalizer.SAXAccessMethodSpec
2014-05-20 10:43:52,207 ERROR localhost-startStop-1 org.springframework.web.context.ContextLoader - Context initialization failed
org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'messageRenderer' defined in class path resource [conf/rsf-config.xml]: Initialization of bean failed; nested exception is org.springframework.beans.ConversionNotSupportedException: Failed to convert property value of type 'org.sakaiproject.util.ResourceLoaderMessageSource' to required type 'uk.org.ponder.messageutil.MessageLocator' for property 'messageLocator'; nested exception is java.lang.IllegalStateException: Cannot convert value of type [org.sakaiproject.util.ResourceLoaderMessageSource] to required type [uk.org.ponder.messageutil.MessageLocator] for property 'messageLocator': no matching editors or conversion strategy found
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:529)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:458)
at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
at org.springframework.web.context.ContextLoader.configureAndRefreshWebApplicationContext(ContextLoader.java:389)
at org.springframework.web.context.ContextLoader.initWebApplicationContext(ContextLoader.java:294)
at org.sakaiproject.component.impl.ContextLoader.initWebApplicationContext(ContextLoader.java:64)
at org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListener.java:112)
at org.sakaiproject.util.ContextLoaderListener.contextInitialized(ContextLoaderListener.java:56)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4973)
at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5467)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:901)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:877)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:632)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:1073)
at org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1857)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: org.springframework.beans.ConversionNotSupportedException: Failed to convert property value of type 'org.sakaiproject.util.ResourceLoaderMessageSource' to required type 'uk.org.ponder.messageutil.MessageLocator' for property 'messageLocator'; nested exception is java.lang.IllegalStateException: Cannot convert value of type [org.sakaiproject.util.ResourceLoaderMessageSource] to required type [uk.org.ponder.messageutil.MessageLocator] for property 'messageLocator': no matching editors or conversion strategy found
at org.springframework.beans.BeanWrapperImpl.convertIfNecessary(BeanWrapperImpl.java:463)
at org.springframework.beans.BeanWrapperImpl.convertForProperty(BeanWrapperImpl.java:494)
at org.springframework.beans.BeanWrapperImpl.convertForProperty(BeanWrapperImpl.java:488)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.convertForProperty(AbstractAutowireCapableBeanFactory.java:1433)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1392)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1128)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:519)
... 26 more
Caused by: java.lang.IllegalStateException: Cannot convert value of type [org.sakaiproject.util.ResourceLoaderMessageSource] to required type [uk.org.ponder.messageutil.MessageLocator] for property 'messageLocator': no matching editors or conversion strategy found
at org.springframework.beans.TypeConverterDelegate.convertIfNecessary(TypeConverterDelegate.java:264)
at org.springframework.beans.BeanWrapperImpl.convertIfNecessary(BeanWrapperImpl.java:448)
... 32 more
May 20, 2014 10:43:52 AM org.apache.catalina.core.StandardContext startInternal
SEVERE: Error listenerStart
May 20, 2014 10:43:52 AM org.apache.catalina.core.StandardContext startInternal
SEVERE: Context /qna-tool startup failed due to previous errors

Merged changes to trunk and branched for Sakai 10.x.
Fixed error in hibernate mapping file causing test failures.

I'm getting a bunch of test failures on this (with the parent changed to 10.0-SNAPSHOT in the pom) so I'm guessing it still needs updates for Spring and Hibernate.