Remove trailing whitespace
Switch to KeystoneHelper

SwiftHelper has been removed, use KeystoneHelper
directly.
Merge pull request #246 from dirkmueller/release/stoney/master

mkcloud failures