Address timeout & warn on vol file inj

Change-Id: I840d3e8239b4b1b77af5fcab4b75e0ac11db10f4
Merge branch 'bug/1188543' of https://github.com/mrda/nova into bug/1188543

Conflicts:
	nova/virt/disk/api.py