[vlc/el7] fixup merge