Change how check for cluster bucket is performed (the old approach did not work on non-EC2 clouds)