Refactored bulk api to work correctly against the 0.6 and 0.7 spec for 2.6