Waffle cleanup -- remove references to now-unused 'elasticsearch' flag.
Merge pull request #2184 from ubernostrum/waffle-cleanup

Waffle cleanup -- remove references to now-unused 'elasticsearch' flag.