BUG: Miscellaneous Utilities to Base/CLI fixes

Change-Id: I11d09aa6f7c68005cf7f5f82e73926c5fdd0da05
Merge topic 'UtilitiesBaseCLIPathFixes'

ebbb569 BUG: Miscellaneous Utilities to Base/CLI fixes