Merge branch 'fixFlavor' into 'master'

Regex only for flavor blocks: flavor { ... }

See merge request fdroid/fdroidserver!407

diff --cc fdroidserver/common.py
Simple merge

diff --cc tests/common.TestCase
Simple merge