Checkstyle tweaks
Checkstyle
[PLAT-3366] Use search in superclass
[PLAT-3366] Add metrics to position master