Use travis installed elasticsearch
Merge remote-tracking branch 'origin/master' into 2391-biosample-attachment