clang-format updates

Pick up latest clang-format from the docs repo and rerun
with clang-format-6.0

Change-Id: I2f0411bb01d78f096563d63b197ce12daf43bcbd
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/fail-monitor/main.cpp b/fail-monitor/main.cpp
index 2c3bc59..90c6126 100644
--- a/fail-monitor/main.cpp
+++ b/fail-monitor/main.cpp
@@ -20,11 +20,12 @@
  * then it will either stop or start the target unit, depending
  * on the command line arguments.
  */
-#include <iostream>
-#include <map>
 #include "argument.hpp"
 #include "monitor.hpp"
 
+#include <iostream>
+#include <map>
+
 using namespace phosphor::unit::failure;
 
 /**