Use standard mesos java formatting
Merge pull request #15 from mesosphere/java-formatter

Use standard mesos java formatting
Resolve conflicts