Branch next Tag:V7-dev.19 Merge Highlights * proper handling of IPv4 address encapsulated in IPv6 * fix(nfs3_setattr): fix nullptr deref in WCC handling * Fix Coverity - 542653, Variable buf going out of scope leaks the storage it points to. Fix Added Signed-off-by: Frank S. Filz <ffilzlnx(a)mindspring.com&gt; Contents: d65054651 Frank S. Filz V7-dev.19 901cdb2bc Avani Rateria Fix Coverity - 542653, Variable buf going out of scope leaks the storage it points to. Fix Added ff5f6194d zhitaoli fix(nfs3_setattr): fix nullptr deref in WCC handling 24c42243e Peter Schwenke Modify nfs_release_nlm_state() to use proper IPv6 matching 3dbf75393 Peter Schwenke SAL: Lock reclaim not working on NFSv4.1 due to locks not being released b67e82c06 Peter Schwenke Add comparison of AF_INET and AF_INET6 addresses to cmp_sockaddr ae1eea767 Peter Schwenke Canonicalise cr_server_addr in get_client_record() 80c92c803 Peter Schwenke Add common function to convert IP addr string to sockaddr_t