Merging upstream version 2.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

tests/nvme_fw_log_test.py

@@ -25,6 +25,7 @@ NVMe Firmware Log Testcase :-
 """
 
 import subprocess
+
 from nose.tools import assert_equal
 from nvme_test import TestNVMe
 
@@ -62,7 +63,7 @@ class TestNVMeFwLogCmd(TestNVMe):
                                 stdout=subprocess.PIPE,
                                 encoding='utf-8')
         fw_log_output = proc.communicate()[0]
-        print(fw_log_output + "\n")
+        print("\n" + fw_log_output + "\n")
         err = proc.wait()
         return err