Merge changes I366435e2,I64577f8f * changes: [findBugs] Silence returning null for StringUtils.toBooleanOrNull() [findBugs] Prefer short-cut logic as it's more performant