Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary

# Conflicts:
#	test/test_automated_install.py

test/test_automated_install.py

@@ -355,7 +355,6 @@ def test_FTL_detect_unknown_no_errors(Pihole):
     ''')
     expected_stdout = 'Not able to detect architecture (unknown: mips)'
     assert expected_stdout in detectPlatform.stdout
-
 # Helper functions
 def mock_command(script, args, container):
     ''' Allows for setup of commands we don't really want to have to run for real in unit tests '''