Add omit method for functional and integration tests
Bug 982738
Forgot the "then" for bash.
Merge pull request #3199 from liggitt/define_omit_for_integration_test

Merged by openshift-bot
Merge pull request #3197 from danmcp/master

Merged by openshift-bot
Merge pull request #3200 from rmillner/fixnode

Merged by openshift-bot