clang-format updates

Run with clang-format-6.0 and update to latest .clang-format
as listed in the docs repository.

Change-Id: I40fb686cc66adf56b2c1b5277ac1c44b64b89349
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/test/test_callout.cpp b/test/test_callout.cpp
index 8d656cc..3ac2c3e 100644
--- a/test/test_callout.cpp
+++ b/test/test_callout.cpp
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <fstream>
-#include <gtest/gtest.h>
-#include <experimental/filesystem>
 #include "callout.hpp"
 #include "dbus.hpp"
 
+#include <experimental/filesystem>
+#include <fstream>
+
+#include <gtest/gtest.h>
+
 using namespace ibm::logging;
 
 class CalloutTest : public ::testing::Test