emergency merge of bug20958 into default

We point to the macports files of the default branch from our web site
and they got broken with the merge of bug20333. This hopefully fixes
that, but further qa is required.

Author: Matthias Radestock

packaging/macports/net/rabbitmq-server/Portfile

@@ -3,7 +3,7 @@
 
 PortSystem 1.0
 name		rabbitmq-server
-version		1.5.5
+version		1.5.3
 revision	0
 categories	net 
 maintainers	[email protected]

packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper

@@ -14,7 +14,7 @@ cd /var/lib/rabbitmq
 SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
-    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+    sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
     echo -e "\nOnly root should run ${SCRIPT}\n"