Fix MAP SDP record generation [3/3].

Register MAS server sockets for UUID/port pair instead of only port so
lower layers have the chance to correctly generate the SDP record.

Change-Id: Ia93f79a290aa23b4ad8370096606678c31d12df5
Merge remote branch 'cm/cm-10.1' into cm-10.1