Merge branch 'stable/folsom' into master

Conflicts:
	cobalt/nova/api.py
	cobalt/nova/extension/manager.py
	cobalt/nova/extension/vmsconn.py
	cobalt/nova/osapi/cobalt_extension.py
	etc/cobalt-compute.conf
	gridcentric/nova/osapi/__init__.py
	setup.py

Change-Id: I91ee843419bcc73e5518661c09fafcd26e13a03b