KNIFE-335 fixing merge issue
KNIFE-335 fixing merge issue

decklin/knife-rackspace,vhl/knife-rackspace,martinb3/knife-rackspace,philoserf/knife-rackspace,rackspace/knife-rackspace,tdooner/knife-rackspace,srirajan/knife-rackspace,chef/knife-rackspace,chef/knife-rackspace