TRUNK-4495 Settings page returns 500

(cherry picked from commit cffe985c9dce9933a2978ecf137d5c2a8b17eed3)
TRUNK-4441 Migrate getDrugs to use LuceneQuery

(cherry picked from commit 141f40a93cdf5fa028c92f5e14fcc82368923ebe)
TRUNK-4441 Increased index version
 MarshallException while trying to create an Encounter - TRUNK-4248
author:lluismf(cherry picked from commit c2fcd08f9a34e51ada6a2c0f11ccbbee59c996d7)