FS-5480 --resolve
log auto adjust ip and port separate so it doesn't get clobbered on hold/update events
FS-5157 patch accepted
Add missing newline at end of mod_say_fa.c
Remove self-assignment without any effect

clang:

  error: explicitly assigning a variable of type 'uint16_t' (aka 'unsigned short') to itself [-Werror,-Wself-assign]
Work around error in pocketsphinx-0.7

  fsg_search.c:263:2: error: non-void function 'fsg_search_reinit' should return a value [-Wreturn-type]
Fix variable type in mod_nibblebill
fix unused parameter warning on windows
FS-5479 --resolve
Add common include paths for jni.h and jni_md.h
Avoid dangling reference at end of fs_cli

Not that it really matters since we're returning to the OS momentarily
at that point anyway.
Remove assignment without effect in fs_cli
Fix unlikely memory leak in ESL
Add missing text editor local variable blocks
Handle potential malloc failure better
Avoid dereferencing potential null value
Remove assignment without effect
Avoid dereferencing potential null value
Avoid using memory after we free it

Without setting errmsg to NULL here, we'll try to print this freed
value again below if another error doesn't intercede.
Avoid using psession uninitialized in mod_fsk