Fixed indentation
Exclude InfiniBand from list of devices available on s390. bnc#819327
Updated changelog.

Conflicts:
	VERSION