Fixed list of qos metrics and updated examples
Merge branch 'master' into 2.0.4

Conflicts:
	pom.xml
	validatorFiles/qos_metrics.xml
generation of monitoring rules from constraints does not raise exception
anymore, just a warning