Merge pull request #1457 from jlsherrill/pulpv2

comps update for pulp2
Merge pull request #1459 from jlsherrill/pulpv2

Pulpv2 - fixes for install
Reverting locale changes to api specs

Reverting changes to api specs that are no longer needed after #1463.
Merge pull request #1468 from jlsherrill/pulpv2-merge

Pulpv2 - merge from master
Automatic commit of package [katello] release [1.3.11.pulpv2-1].
fixing compass version
Automatic commit of package [katello] release [1.3.5-1].
fixing pulpv2 version in spec
Automatic commit of package [katello-configure] release [1.3.3.pulpv2-1].
Merge pull request #1466 from daviddavis/apispecfix

Removing locale changes to api specs
adding pulp-builtin rpms to comps
changing pulp configure to use ssl for qpid
Automatic commit of package [katello-configure] release [1.3.4.pulpv2-1].
merge conflict