Remove apply, update version to 3.1.0
Fixed spurious version too low message when elasticsearch is unreachable
Merge remote-tracking branch 'upstream/master'