[7.0] Backport: Indicate that ILM is on by default and add new settings (#11485)#11585

Merged

dedemorton merged 2 commits intoelastic:7.0from dedemorton:backport_11485_7.0

Apr 4, 2019

+76-111

Commits on Apr 2, 2019

Indicate that ILM is on by default and add new settings (elastic#11485 )
dedemorton
committed

Commits on Apr 3, 2019

Merge branch '7.0' into backport_11485_7.0
dedemorton
authored