Contribute NSILI support bugfixes and improvements to Alliance

Last year developed a collection of bugfixes and improvements for NSILI support in a fork of Alliance. These changes were never merged back to master, leaving several outstanding issues with NSILI support that should be and can easily be fixed. Rebase these changes on Alliance master so they can be merged.