Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code
Bring javelin back to the status of being able to start System VMs after another round of master branch merge