Merge "bifrost: test-bifrost-deployment: Allow overriding VM hardware options"