Fix for TIM-449. Do not use Peer UUID
Merge pull request #264 from edx/sanchez/TIM-449-No-Sub-Matching-UUID

Fix for TIM-449. Do not use Peer UUID