Changing order of JSON items for DataSourceVO and DataPointVO and
ensuring that name and enabled members get exported.  Also changed
operation of XID import on these items.