Merge remote-tracking branch 'upstream/master'
opal-search/src/main/java/org/obiba/opal/search/es/EsIndexManager.java
OPAL-1642 - NPE in IndexManager
Merge branch 'master' of github.com:kazoompa/opal
Merge pull request #69 from kazoompa/master

OPAL-1642