Initial commit of PR into separate fog-profitbricks repository.
Ported code from Pull request fog/fog#3187