AGREE: fixing error in cycle checking for nodes
Merge branch 'master' of https://github.com/smaccm/smaccm

Conflicts:
	fm-workbench/resolute/com.rockwellcollins.atc.resolute.ui/src-gen/com/rockwellcollins/atc/resolute/ui/contentassist/antlr/internal/InternalResolute.tokens
	fm-workbench/resolute/com.rockwellcollins.atc.resolute.ui/src-gen/com/rockwellcollins/atc/resolute/ui/contentassist/antlr/internal/InternalResoluteLexer.java
	fm-workbench/resolute/com.rockwellcollins.atc.resolute.ui/src-gen/com/rockwellcollins/atc/resolute/ui/contentassist/antlr/internal/InternalResoluteParser.java
	fm-workbench/resolute/com.rockwellcollins.atc.resolute/src-gen/com/rockwellcollins/atc/resolute/Resolute.xtextbin
	fm-workbench/resolute/com.rockwellcollins.atc.resolute/src-gen/com/rockwellcollins/atc/resolute/parser/antlr/internal/InternalResolute.tokens
	fm-workbench/resolute/com.rockwellcollins.atc.resolute/src-gen/com/rockwellcollins/atc/resolute/parser/antlr/internal/InternalResoluteLexer.java
	fm-workbench/resolute/com.rockwellcollins.atc.resolute/src-gen/com/rockwellcollins/atc/resolute/parser/antlr/internal/InternalResoluteParser.java
	fm-workbench/resolute/com.rockwellcollins.atc.resolute/src-gen/com/rockwellcollins/atc/resolute/services/ResoluteGrammarAccess.java