CSPACE-6064: Additional minor changes, detailed in comments on relevant issue. App layer now builds successfully following merge of unified config work with (v4.0) master.