Cleaning up bad/partial commit of WHIRR-525

git-svn-id: https://svn.apache.org/repos/asf/whirr/trunk@1372995 13f79535-47bb-0310-9956-ffa450edef68
14 files changed