Port blktap3 changes to trunk