adapters integrated
Merge branch 'dev' of https://github.com/davidyuan1989/nova into dev

Conflicts:
	nova/scheduler/periodic_checks.py