Merge branch 'develop' into feature/SEQWARE-1242_integration_tests
Resolve compilation error due to merge
Merge branch 'feature/SEQWARE-1242_integration_tests' into feature/SEQWARE-1614_arbitrary_host