Fixing more inconsistencies#1197

djdanielsson merged 9 commits intoredhat-cop:develredhat-cop/infra.aap_configuration:develfrom

djdanielsson:fixing_more_inconsistenciesdjdanielsson/infra.aap_configuration:fixing_more_inconsistenciesCopy head branch name to clipboard