Imported Upstream version 4.0.4
Merge tag 'upstream/4.0.4'

Upstream version 4.0.4
Update changelog

Signed-off-by: Vlad <vg@vladgh.com>
Minor fixes

Signed-off-by: Vlad <vg@vladgh.com>
Update changelog

Signed-off-by: Vlad <vg@vladgh.com>
Fix packaging

  * Add locations configuration file

Signed-off-by: Vlad <vg@vladgh.com>
Update changelog

Signed-off-by: Vlad <vg@vladgh.com>