Updates to the update-images.py script and utilities
Removes redundant amqp_port_t definitions from pulp-server
Merge pull request #1247 from bmbouter/1136919

1136919 - Removes redundant amqp_port_t definitions from pulp-server
Fixed changelog for pulp-nodes.spec
Merge pull request #1253 from dkliban/2.5-testing

Fixed changelog for pulp-nodes.spec
Merge branch '2.5-dev'
Removed an autogenerated file and a pointless if/else statement in the openstack utilities
Merge pull request #1241 from pulp/jcline-update-image-builder

Updates to the update-images.py script and utilities
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Merge remote-tracking branch 'origin/2.5-dev'
Automatic commit of package [pulp] release [2.5.0-0.10.beta].
Automatic commit of package [pulp-nodes] release [2.5.0-0.10.beta].
Eliminate all 2.4.x pre-release changelogs.
Fixed the names for the RHEL 6 jenkins configurations
Merge branch '2.5-testing' into 2.5-dev
Merge pull request #1255 from pulp/jcline-jenkins-config

Fixed the names for the RHEL 6 jenkins configurations
Merge branch '2.5-dev'