Merge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel