Add qpid-python to requirements

Qpid is a supported messaging library, and without this it is
necessary to install it manually in order to use Qpid in some
environments, notably the one used by TripleO.

Change-Id: I398c1d35295223cbc6969b386129c6fc9acbefc7
Closes-Bug: #1225191
Fix handle_create of NetDHCPAgent for updating

When NetDHCPAgent is updated with new network_id which is already
associated with the dhcp_agent_id, UPDATE_FAILED occurs in Heat. Fix
handle_create to check associating information to avoid this situation.

Closes-bug: #1272258
Change-Id: Ic827295e773d893d9af6d7cf1c687aee69e98298
Merge "Add qpid-python to requirements"
Merge "Fix handle_create of NetDHCPAgent for updating"