Squashed commit of the following:

commit 3a5429d0d849f2b6fcbb28941b9d5929f820efe6
Author: Albert Louis Rossi <arossi@otfrid.fnal.gov>
Date:   Wed Apr 3 08:54:41 2013 -0500

    module: billing unit test

    Removing problematic unit test.  This test really doesn't test much anyway.

    Target: trunk
    Require-book: no
    Require-notes: no
    Acked-by: Gerd
    Patch: http://rb.dcache.org/r/5394
alarms: Add check for whether the alarms service is the only service in the domain

Since the alarms service loads an alternative logback configuraiton, it cannot
sensibly be mixed with other services. This patch adds a check in the batch
file which will refuse to start the alarms service if it is combined with other
services.

I had to make minor modifications to the boot loader (the old code was an
ugly hack anyway).

Target: trunk
Require-notes: yes
Require-book: yes
Acked-by: Albert Rossi <arossi@fnal.gov>
Patch: http://rb.dcache.org/r/5406/
Merge branch 'master' of https://github.com/dCache/dcache
Merge branch 'master' of https://github.com/dCache/dcache
Squashed commit of the following:

commit f7005db5868f9aa5f9b07f0e8e3135d2c672a764
Author: Albert Louis Rossi <arossi@otfrid.fnal.gov>
Date:   Thu Apr 4 08:59:51 2013 -0500

    module: webadmin (pool-queue-plots)

    On start-up it is possible for the PoolMonitorCollector to retrieve a CostModule with NULL CostInfo objects for the pools.

    There is currently a bug in the RrdPoolInfoAgent's handling of this code branch which causes an NPE; this is because the
    "addAll" method is given a placeholder replacement for the NULL CostInfo object which does not have any of the required
    PoolQueueInfo attributes set.

    The correct procedure here is to skip the update rather than force it to 0.

    Acked-by:
    Target: trunk
    Require-book: no
    Require-notes: yes

    RELEASE NOTES:
    Under certain conditions it is possible to get a NPE at startup of the webadmin pages when pool-queue-plotting is enbaled.  This has been fixed.