NOJIRA Clean up of tests context xml to use production context where appropriate
SSP-1934, SSP-1958
SSP-1958 additional required contexts to support jobOperator.stop()
NOJIRA additional context for test