Integrates following changes: - Fix compilation error because of shadowed variable (PPW-646) (16b107d3) References: PPW-646 Signed-off-by: prplbot <bot@prplfoundation.org>