Resharper 8.2 changes; replace Guid with long Id

Incorporate changes as per Resharper 8.2.  Add long Id to replace Guid
Id.  Target .NET 4.5