Enabling -Wshadow and fixing the new warnings.

Issue: PLCR-544