Improves the OTR policy so that automatic sessions will no longer be reinitiated if OTR is stopped manually. Also cleans up outdated javadoc.