integrated revision from trunk: r50509 , r50646 , r50741 : escape xml entities in direct indexing + upgrade postgres driver version + not depending on commons-dbcp2
integrated revision from trunk: r50509 , r50646 , r50741 : escape xml entities in direct indexing + upgrade postgres driver version + not depending on commons-dbcp2