Issue 657- Fix for conflicting auto-transitions in same state (with and without do activities)

git-svn-id: http://umple.googlecode.com/svn/trunk@4821 6ebf9d09-8eb1-0036-9d08-68c07d1b990a