NodeId::TypeId now an enum class with int_64t as base type
Fixed style errors.
Merge branch 'next' into nfs_change + cleaning up