formatter: update clang-format and fix-up file(s)

clang-format-6.0 introduced new changes, also then updates to
.clang-format introduce more new changes.

Change-Id: Iec9f84e3a7a5bf254d66eee46cdc9b3070e06687
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/manager.cpp b/manager.cpp
index 8b35a0a..c138d40 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <iostream>
-#include <exception>
-#include <chrono>
-#include <algorithm>
-#include <phosphor-logging/log.hpp>
-#include <experimental/filesystem>
 #include "manager.hpp"
+
 #include "errors.hpp"
 
+#include <algorithm>
+#include <chrono>
+#include <exception>
+#include <experimental/filesystem>
+#include <iostream>
+#include <phosphor-logging/log.hpp>
+
 using namespace std::literals::chrono_literals;
 
 namespace phosphor