Update the multicast port and GenerateToken code in RI accordingly.

Update the multicast port and GenerateToken code in RI accordingly.

Update the Multicast port to 5683 accordingly in RI as per connectivity code.
Connectivity code fixed generate token code. Remove the temporary fix that
was added in RI code.

Change-Id: Iec9b07b98d65309a4cc2998252fcc8c445975f55
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Tested-by: Sudarshan Prasad <sudarshan.prasad@intel.com>