Issue 2215: Error 500 on GE Summary page
Issue 2215: Adding tests
Resolving merge conflicts
Resorting the GE step defs
Merge with master
Merge branch 'master' into issue_2215
Removing a '-' which is no longer needed
Merge pull request #1119 from scottsds/issue_2215

Issue 2215: Error 500 on GE Summary page