Fix inclusion of files with classifier and non jar suffix