Fixes to make docker 0.8 work with btrfs driver on arm
Fixed as per reviewer comments
Merge pull request #726 from farcaller/master

Fixes to make docker 0.8 work with btrfs driver on arm