refs #8557 Two questions to 2 suspicious places of code

Two places found after code review which look like wrong. Questions to code were placed after //!!! mark
Merge branch 'master' into feature/8557_SNSvsISIS
Merge branch 'feature/8557_SNSvsISIS' into develop