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
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.7.3-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.12.4-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.10.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.12.4-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [0.6.2-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.13.3-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.7.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.12.4-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.12.3-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [0.5.4-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.5.4-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.7.4-1].
Automatic commit of package [openshift-origin-cartridge-php] release [0.7.3-1].
Automatic commit of package [rubygem-openshift-origin-admin-console] release [0.0.5-1].