Issues https://github.com/energyos/OpenESPI-Common-java/issues/145  and https://github.com/energyos/OpenESPI-Common-java/issues/124

issue: https://github.com/energyos/OpenESPI-Common-java/issues/145 - fixed for consistent style
issue: https://github.com/energyos/OpenESPI-Common-java/issues/124 - added findByKind to service level