fix system_ssh_key remove case
Update template app and cart documentation
Separate currency symbol into helper method
<node spec> bug 949543 use resource_limits.template directly as .conf in RPM

https://bugzilla.redhat.com/show_bug.cgi?id=949543
(Origin clone of Enterprise https://bugzilla.redhat.com/show_bug.cgi?id=949260)
This change causes the node RPM to own the resource_limits.conf file so that
when it changes, users will at least get a .rpmnew file to show that they
might want to look at updating their resource_limits.conf file to incorporate
the changes.
Add mysql v2 snapshot/restore tests
Bug 949843: Don't lock the directory to be synced.
node scripts Bug 920477 - replace -? short option with documented -h

https://bugzilla.redhat.com/show_bug.cgi?id=920477

Both scripts show "-h" as the short option for "--help" in their usage
output - updated code to match docs.
Registering/installing the cartridges in the rpm %post

The v2 php cartridge already had this:
http://lists.openshift.redhat.com/openshift-archives/dev/2013-April/msg00051.html
Merge pull request #1965 from rajatchopra/master

Merged by openshift-bot
Delete move/pre-move/post-move hooks, these hooks are no longer needed.

Remove move/pre-move/post-move hook references

Mcollective cleanup: remove methods and references related to move, pre-move and post-move.
Gear Move changes: Keep same uid for the gear When changing the gear from one district to another.

Added district test case: Tests reverse_uid with preferred uid logic

Bug fixes
Change 'allow_change_district' to 'change_district' and remove warnings when target server or district is specified.
Fix start/stop carts order in move gear.
Merge pull request #1967 from ironcladlou/dev/v2carts/jbossews

Update template app and cart documentation
Merge pull request #1969 from liggitt/currency_display

Separate currency symbol into helper method
Merge pull request #1968 from pmorie/dev/v2_mysql

Add mysql v2 snapshot/restore tests
Merge pull request #1971 from mrunalp/bugs/949843

Bug 949843: Don't lock the directory to be synced.
Merge pull request #1973 from dobbymoodge/BZ920477

node scripts Bug 920477 - replace -? short option with documented -h
Add core platform test for v2 snapshot/restore
Merge pull request #1974 from brenton/v2_post2

Registering/installing the cartridges in the rpm %post
Merge pull request #1976 from calfonso/master

Cartridge fixes