[package] [diskmount-osmc] Add conditional tests to properly handle upgr...

...ades. Reinstate --rename