nvi: import version 2.2.1-52c07e8
(cherry picked from commit 4087ffdbce725367566bc3fc60a959292daac99d)