BZ1029526 - Version history: error on viewing deleted asset. Fix merge conflict