Re-factor Companion Version Checking Code.

Re-Factor Companion Version Checking code so that new and old
companions will work (but new features will only work on the new
companion). This is to help alleviate a “Flag Day” for our users.

Change-Id: Ib283d53b17d650a3b62f4d0d265548e42082b5c1