Adjust guard to tolerate bucket types
Merge pull request #704 from basho/adt-bucket-type-guard

Adjust guard to tolerate bucket types