Merge "Add OptionClass alias smoke-failure-email"