Remove raw references to Map in XSQL

This adds the proper types to map, removing some casts and improving
efficiency slightly. Fixes quite a few of eclipse warnings.

Change-Id: Ia8cc61961a1898dd17e4e5d0e6e7a247475a007a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Remove raw references to Map in XSQL"