[candlepin] branch cleanup