roomservice: Fix roomservice for Team-Octos
             Also fix a condition where a duplicate roomservice entry
             is being added when a Team_Octos device exists on Team-Octos github

Change-Id: I818866c5963480bc0d7d0ecbcf8ef867ed9ca8b5