Fix log path for Sunstone in system wide installation
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8