Merge branch 'devel' into mediamonitor2

Conflicts:
	python_apps/api_clients/api_client.py

python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

@@ -291,7 +291,10 @@ class MediaMonitorCommon:
         self.logger.debug(command)
         stdout = self.exec_command(command)
 
-        return stdout.splitlines()
+        if stdout is None:
+            return []
+        else:
+            return stdout.splitlines()
 
     def touch_index_file(self):
         dirname = os.path.dirname(self.timestamp_file)