LPS-32523 Source formatting
LPS-32755 Fix tests caused by upgrade to Tika 1.3