Merge "Pass mount_path through to ssh_client.mount in scenario manager"