simplifying logic for showing extend trial and adjusting tests#20211

Merged

bmcconaghy merged 2 commits intoelastic:masterfrom bmcconaghy:simplify_extend_trial_logic

Jun 25, 2018

+50-79

Commits on Jun 25, 2018