Arcyd: refactor, move rev_id logic into branch

Test Plan:
$ ./precommit.sh
$ ./testbed/arcyd/acceptance_tests.sh