Add feature conflicts and parameter persistence for forge#570

jeremylenz wants to merge 11 commits into

theforeman:mastertheforeman/foremanctl:masterfrom

jeremylenz:feature-conflictsjeremylenz/foremanctl:feature-conflictsCopy head branch name to clipboard