allow oo-trap-user to run from non-public-key auth

clarified command branching and debugging

commented syslogs for debugging to minimize load

commented one more line

Prevent double-calling oo-trap-user twice
Merge pull request #4019 from markllama/bugs/BZ1024102

Merged by openshift-bot