integrated Alejandro's changes to the maps
Fixing VMWare graph templates.

The templates had some issues catched by PropertiesGraphDaoTest.

There are still minor issues that should be fixed, for example, the last
line of each graph template should not contain a back-slash character.
Merge remote-tracking branch 'origin/master' into name-cutter