Make compatible with Xtext 2.4.2
Minor cleanups
Merge branch 'master' into agree_records

Conflicts:
	fm-workbench/agree/com.rockwellcollins.atc.agree.ui/src-gen/com/rockwellcollins/atc/agree/ui/contentassist/antlr/internal/InternalAgree.g
	fm-workbench/agree/com.rockwellcollins.atc.agree.ui/src-gen/com/rockwellcollins/atc/agree/ui/contentassist/antlr/internal/InternalAgreeParser.java
	fm-workbench/agree/com.rockwellcollins.atc.agree/src-gen/com/rockwellcollins/atc/agree/parser/antlr/internal/InternalAgree.g
	fm-workbench/agree/com.rockwellcollins.atc.agree/src-gen/com/rockwellcollins/atc/agree/parser/antlr/internal/InternalAgreeParser.java
	fm-workbench/agree/com.rockwellcollins.atc.agree/src-gen/com/rockwellcollins/atc/agree/services/AgreeGrammarAccess.java
	fm-workbench/agree/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/GenerateAgree.mwe2