Automatic commit of package [katello-configure] release [1.3.6-1].
version bump
Automatic commit of package [katello-cli] release [1.3.4-1].
merge conflict fix
Merge pull request #1484 from jlsherrill/conflict-fix

merge conflict fix
version bump
Automatic commit of package [katello-cli-tests] release [1.3.5-1].