Merge pull request #2209 from antonioperic/master

Adding elasticsearch to Vagrant box