[6.x] simplifying logic for showing extend trial and adjusting tests (#20211)#20216

Merged

bmcconaghy merged 1 commit intoelastic:6.xfrom bmcconaghy:backport/6.x/pr-20211

Jun 25, 2018

+50-79

Commits on Jun 25, 2018

simplifying logic for showing extend trial and adjusting tests (elastic#20211 )
bmcconaghy
committed