Updated software list for 5.0; also moved to pre-install

Change-Id: I3976949770e39b80c100abfd956bed7b1c59886b