This reverts commit 0cf70a6e.

NEOgo and NEOpy diverged wrt the NEO URI format. Due to NEOgo
changes in the NEO URI format nexedi/slapos@0cf70a6e was necessary.
However in nexedi/neoppod!18 and
nexedi/neoppod!21 a common
URI format for NEOgo and NEOpy was agreed on. Therefore most changes of
nexedi/slapos@0cf70a6e are no
longer necessary. We still need the difference between 'neo' (without
SSL) and 'neos' (with SSL), but we'll re-introduce this in the next
commit.

This revert keeps the changes made in nexedi/slapos@6fa1d9ae as this is still
needed.

/reviewed-by @kirr @jerome
/reviewed-on nexedi/slapos!1620