bug-1339: remove all traces of OTP
Merge branch 'bug-1339' into testserver-stable