Teak is correct this time: HIV group O is an HIV-1, and HIV-2 is a completely separate virus. No need to worry about group O: first of all it's extremely rare, and second, even the tests not officially approved for group O can detect it quite well.
No it not the same. HIV1 Group O is not the same as HIV2. Bayer's ADVIA Centaur HIV 1/O/2 tests for HIV Type 1+ Group O and also HIV Type 2.