interaction servlet tweaks, fixes #604
Merge remote-tracking branch 'origin/master'