GUVNOR-2003
Merge remote-tracking branch 'origin/GUVNOR-2003' into 5.5.2.chtijbug

Conflicts:
	guvnor-webapp-drools/src/main/java/org/drools/guvnor/client/asseteditor/drools/modeldriven/ui/RuleModeller.java