Use default cidr to avoid exception when editing quantum security rules.

$ quantum security-group-rule-create --direction ingress --protocol TCP
--port-range-min 80 --port-range-max 80 web

After creating security group rule with command above, An exception is thrown
when editing the rules for groups web.

Fixes: bug #1165095

Change-Id: If32992622ebc20559dde911455b241937eb59ae6
(cherry picked from commit 706560f6d230334d645ce97301631baaa5c56095)
Fix floating IP management from instance panel.

Quantum Floating IP API works with ports ids not instances ones
(opposite to what Nova Network does). So if we want to associate
(disassociate) an allocated floating IP to some instance we must
use the "target_id" (which is a port_id in case of Quantum and an
instance_id in case of Nova network).

Fixes bug 1158596.

Change-Id: Iceba4d8ee74bd58dc1cdbda7668841b0a7eb86f1
(cherry picked from commit de1940c922b0f5fc965a637a9dcf0734530cb85d)
Merge "Fix floating IP management from instance panel." into stable/grizzly
Merge "Use default cidr to avoid exception when editing quantum security rules." into stable/grizzly
Merge branch 'stable/grizzly' of https://github.com/openstack/horizon into grizzly/router_rules

Conflicts:
	openstack_dashboard/dashboards/project/instances/tables.py