Fix -echo problems again

Workaround for jline/jline2#163, make sure that only ever one instance of
Terminal is created to avoid introducing a race condition when the new instance
tries to restore an intermediate state at the end of its lifecycle.

@daithiocrualaoich Could you perhaps give this a try?