Update tools to use 2.1.1 and add missing ES args to two export tools.
Update tools to use 2.1.1 and add missing ES args to two export tools.

mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid