Spec updates
Fingerprint and PublicPort fixes
Merge pull request #2074 from christav/spec-updates

Spec updates