added upgrade scenario for ubuntu and some other changes