backportin forgotten changes (bnc#831872)

limit the number of the searched disks to 8 of each kind to
shorten time needed for finding SSH keys (port of fate#305873)