OF: Fix bugs encountered during subdir tests
OF: Fix bugs encountered during subdir tests
apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet