Fix functional test 'test_scrubber_with_metadata_enc'

This test fails if a real swift system is specified in a config file
and passed to the tests via the GLANCE_TEST_SWIFT_CONF environment
variable. The fix is to allow location schemes of the form
'swift+http' as well as 'swift+https'.

Fixes bug 1158805

Change-Id: I9fd3a9c02b31acc2a8313acd3b88124a17d0adfb
Merge "Fix functional test 'test_scrubber_with_metadata_enc'"