Changes to retrieving Whisper data

Please consider the following two commits we use in carbonserver (in progress replacement for the graphite frontend on stores).  Thanks.