Cherry picked changes in gis/admin to support geometry field in admin