Hard code some reasonable defaults and move defaults files for dinistiq at the same place as for spring
Merge branch 'master' into capedwarf
Remove marker beans.xml from servlet package as well