Merge branch 'stable-2.15'

* stable-2.15:
  CreateServiceUserCommand: Don't concatenate Strings in a loop
  Use StandardCharsets.UTF_8 instead of "UTF-8" string
  Format Java files with google-java-format 1.6

Change-Id: I6a092c00591dff27121a1f33137973b5037d6301