Ticket 49275 - fix compiler warns for gcc 7
Bug Description: GCC 7 enables many more stricter warnings about
code quality.
Fix Description: Fix another set of shadow vars, case fall
throughs and unused functions.
https://pagure.io/389-ds-base/issue/49275
Author: wibrown
Review by: mreynolds (Thanks!)