Resolve "remove -Wshadow warning"

Rashad Kanavathrequested to merge
1579-remove-wshadow-warning into develop

Closes #1579 (closed)

Edited by Rashad Kanavath

Merge request reports