Fix up a couple of references to 'only_if' and change them to 'when'
Merge pull request #2826 from tgerla/devel

Fix up a couple of references to 'only_if' and change them to 'when'