Bug 5008/some typos missed in rudder init and rudder upgrade adaptation