Merge pull request #136 from krivera-pentaho/dev

BIServer 8291 Added the id of the metadata connection as the name of the DatasourceInfo
Added ".xmi" stripping of the ids of the DSW connection types.