joj68: remove intgration test which seem to be changing the sql alchemy session string
Set the path for files in the web setup correctly
JOJ59: Copy scientific configurations to the database
Also remove parameters if already set scientific configuration or driving data set
Merge branch 'JOJ-59'
Merge branch 'master' of github.com:NERC-CEH/jules-jasmin

Conflicts:
	majic/joj/controllers/model_run.py
	majic/joj/tests/functional/test_model_run_extents.py
Merge remote-tracking branch 'remotes/origin/master' into JOJ-56

Conflicts:
	majic/joj/services/model_run_service.py
Small changes to model_run_service, model_run