fix requirement in the spec and gemspec

plugin do not use json, no mention of rspec or mocha in the code
or rakefile, and that's the stickshift-common gem that's used
Move v2 mysql setup invocation marker to gear data directory
Add support for specifying websocket port in the manifest.
Bug 928675

Replace all occurrences of http://openshift.redhat.com with http://www.openshift.com
Merge pull request #2157 from mrunalp/dev/websocket_port

Merged by openshift-bot
Bug 953401: Run v1 tidy in the correct user context
The v2 cartridge needs to pull in the ruby-1.8 dependencies as well

Also, I sorts these more alphabetically by section.
Merge pull request #2094 from BanzaiMan/dev/hasari/bz928675

Bug 928675
Bug 952513
Merge pull request #2159 from ironcladlou/bz/953401

Merged by openshift-bot
Merge pull request #2161 from pmorie/dev/v2_mysql

Merged by openshift-bot
Merge pull request #2162 from brenton/specs3

Merged by openshift-bot
Merge pull request #2163 from bdecoste/master

Merged by openshift-bot
Merge pull request #535 from mscherer/fix_uplift_gem

Merged by openshift-bot