[Merge] lp:~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3 into lp:ubuntu/python-heatclient

[Chuck Short]

Needs work
-- 
https://code.launchpad.net/~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3/+merge/209795
Your team Ubuntu branches is requested to review the proposed merge of lp:~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3 into lp:ubuntu/python-heatclient.