Create branch es-1.4 for elasticsearch 1.4.0
Fix test `BAD_REQUEST` is now `NOT_FOUND`

(cherry picked from commit 1e233b9)