adjust upgrade page UI for dist-upgrade and remove blank at line end

Change-Id: I887c42f9258b793f7c24283c83e6943d3a3f82d6
Merge "adjust upgrade page UI for dist-upgrade and remove blank at line end"