Bug fixes

-- fix for LP bug 1396311: failed primary key constraint was
   not cleaning up metadata entry
-- removed obsolete code reference in gui debugger
-- disabled display of software version stored in metadata until
   install scripts add enhancement to update metadata with
   current software version

Change-Id: I3922e689feec1d0e048083b9a36e6b43f2def49d
Merge "Bug fixes"