Resolve merge conflict in tests.mustache
Resolve merge conflict in tests.mustache

edolyne/hive,artelse/buckets,mikesmithmsm/buckets,nishant8BITS/buckets,nishant8BITS/buckets,asm-products/buckets,artelse/buckets,asm-products/buckets,edolyne/hive,mamute/buckets,bucketsio/buckets,dut3062796s/buckets,bucketsio/buckets,edolyne/buckets,mamute/buckets,dut3062796s/buckets,mikesmithmsm/buckets,edolyne/buckets