IoTivity-1.2.1a

Merged in latest fixes from develop branch
Addressed github PR review feedback

IoTivity v1.2.1

Fix release build error

Signed-off-by: Dave Thaler <dthaler@microsoft.com>