Merge branch 'thanos-compactor-retention-resolution-flag-validation' …

…of github.com:moadz/thanos into thanos-compactor-retention-resolution-flag-validation

Signed-off-by: mzardab <mzardab@redhat.com>