Merge changes from cvs trunk
Merge fixes from usage-stats.globus.org server