Merge proposals dependent on lp://qastaging/~stoq-dev/stoqdrivers/master

lp://qastaging/~stoq-dev/stoqdrivers/master has no merge proposals.