Draft: Update of MSI code

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114045 Tested: TBD

THIS IS A DRAFT AND IS NOWHERE NEAR READY FOR REVIEW - IN FACT I DOUBT IT EVEN COMPILES

Signed-off-by: David Arcari darcari@redhat.com