Number of fixes to handle recent FluentSharp refactorings. Added Cat.NET code files (from O2_Scanner_MsCatNet project)