bug 1288: Accept STARTTLS as last option
Merge branch 'bug-1288' into testserver-stable