solved issue https://github.com/globaleaks/GlobaLeaks/issues/351
Merge branch 'devel' of ssh://github.com/globaleaks/GLBackend into devel
Merge branch 'devel' of https://github.com/globaleaks/GLBackend into devel
added conditional check to avoid duplicate edits of apparmor local system_tor file