Fixes CCI wait_for_transaction

Fixes wait_for_transaction to only block on transactions that pertain to the provisioning or reloading of a CCI and not any of the child transactions such as setting up monitoring or setting up VPN accounts, etc.