libnmap: bump version and rebase upstream unmerged features
libnmap: bump version and rebase upstream unmerged features