mount-setup: relabel items mentioned directly in relabel-extra.d

mount-setup: relabel items mentioned directly in relabel-extra.d

relabel_extra() relabels the descendants of directories listed in
relabel-extra.d, but doesn't relabel the files or directories
explicitly named there.  This makes it impossible to use
relabel-extra.d to relabel the root of a filesystem.  Fix by
relabeling the named items too.

(cherry picked from commit 71de68476c1897b8624538ce32218891251fa5f6)
(cherry picked from commit 29308bcc1326521081f4d7369945d325c2d41faa)

Gbp-Pq: Name mount-setup-relabel-items-mentioned-directly-in-relabel-e.patch