Change the way we handle include_branch_name internally.  Makes the setter logic slightly cleaner.
Cleanup consul key generation logic to use a consistent function.