[7.x] Fix conflict between timelion.ui.enabled yml setting and timelion feature control (#35266)#35765

Merged

lukeelmers merged 1 commit intoelastic:7.xfrom lukeelmers:backport/7.x/pr-35266

Apr 30, 2019

+12-15

Commits on Apr 29, 2019

Fix conflict between timelion.ui.enabled yml setting and timelion feature control (elastic#35266 )
lukeelmers
committed