Merge branch 'feature/neutron-network-ids-facts' into stable/havana