Merge "use Calipso verify.sh for easier control of verification"