EA-1158: Move blktap2.py into blktap3.py and partially rebase blktap3.py