pulled in changes from the upstream repo

Manually resolved a conflict in the WebApi.Hal\Representation class