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/functor.cpp b/functor.cpp
index b9e2521..90d713a 100644
--- a/functor.cpp
+++ b/functor.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include "functor.hpp"
+
 #include <sdbusplus/bus.hpp>
 
 namespace phosphor