IDEA-122417 (facet configuration deserialization fixed)
Cleanup (obscure logging util deprecated)
Cleanup (dead, duplicated, and purely organized code)
Merge remote-tracking branch 'origin/master'