Fixed static analysis warnings
(closes #3829)
Merge pull request #3830 from aeslaughter/static-analysis

Fixed static analysis warnings
Merge commit 'b45ac7057df80519a3274f834fb8e55677286761'