Delete expired instance console auth tokens

Instance console auth tokens never get deleted from the cache
before the instnace is deleted, this is a waste of memory. now
we check if tokens are expired then remove them from the cache
before store new tokens.

Fix bug #1209134

Co-authored-by: Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
(cherry picked from commit e3bbf2e81137bbcdc39bdfb4c4ff62f30c37afda)
Conflicts:
	nova/tests/consoleauth/test_consoleauth.py

Change-Id: I8dd5089ebaed3b3d91932f1f1558bbe302cd5675
Refresh network info cache for secgroups

Before updating security group rules, we need to make sure that
the info cache is up-to-date. Without this source groups are not
updated properly. This was a regression introduced in commit
85aac04704350566d6b06aa7a3b99649946c672c which fixed a potential
DOS using source groups.

Fixes bug 1216720

Conflicts:
	nova/network/manager.py
	nova/tests/network/test_manager.py

Change-Id: I6b5115df53f2e159ea506ef966cd49cedd35f83d
(cherry picked from commit 8679b2c8e7f9fddc31a74ad00f6705bca00a762b)
Merge "Refresh network info cache for secgroups" into stable/grizzly
Merge "Delete expired instance console auth tokens" into stable/grizzly
Merge branch 'stable/grizzly' of https://github.com/openstack/nova into kbenton/ivssupport_grizzly