Merge "Avoid vagrant-specific bits of single scenario for ecord-global on physical hardware"