Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Use Strings.isNullOrEmpty instead of just null check
  Code cleanup: use Objects.equals instead of own eq method
  Clarify and fix sharedDirectory configuration

Change-Id: Ie4d44ed063c11617dc7d9baa5e93a3b2ab995514