Branching/Offline/Locking enhancements

Cleans up the branch names during detection. Bumps up the logging around
exceptions in feeds. Adds fallback mechanism to offline mode when all
feeds fail. Softens the locking mechanics to only verify during the
restoration.