Show test index
Merge branch 'scabrero/show-test-index'
fix dist-upgrade command
Merge branch 'master' into rduran/openstack-support

Conflicts:
	ChangeLog