fix logstash grok/geoip to observe on openbazaar network hello map
Don't upgrade on Ubuntu.
Move saveSettings() to settings.js
Merge pull request #519 from sophron/remove-upgrade-on-configure

Don't upgrade on Ubuntu
Merge pull request #520 from simondlr/settings_fix

Move saveSettings() to settings.js
Merge remote-tracking branch 'upstream/master' into kibana-hello-map
Merge pull request #509 from y12studio/kibana-hello-map

fix logstash grok/geoip to observe on openbazaar network hello map
Use SIGKILL after delay and only if need

Sometimes OB is not reacting on SIGTERM, we need SIGKILL it.
This change add some delay before we do it.
Remove redundant pass-es.
Remove unused variable (idx).
Enforce new-style capturing of exception object (PEP 3110).
Invoke join on separator.
Remove unused import.
Replace calls to map with list comprehensions.

In Python 2, a call to `map` builds an actual list,
so it behaves exactly the same as the comprehension syntax.
The latter reads better.
Replace one-off lists with generators.

As the entire list doesn't get built, less space is needed
and performance may improve.
Switch empty order messages
Drop unnecessary slice.
Fix typos.
Remove unused import.
Merge pull request #534 from Renelvon/style_fixes

Style fixes