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

Fixed static analysis warnings