bug 1136: fixed returns and revoke_cert calls
Merge branch 'bug-1136' into testserver-stable