Added a missing action from application-context.xml
Merge backwards from master.