Merge remote-tracking branch 'origin/master' into cleanup
Merge remote-tracking branch 'origin/master' into cleanup
Fix service store tests, only do search controller if the SFX db is configured, add vcr cassettes.
Merge remote-tracking branch 'origin/master' into cleanup
Merge in cleanup branch changes.