Enhance my hack to catch (more of the) false negatives of
Mk/Scripts/check-stagedir.sh in the presence of options to
also handle %%DATADIR%% in pkg-plist.

This would have caught what I fixed with r525543 | gerald | 2020-02-08.

PR: 220950