Improve distribution conditionals

Change-Id: I656687190d02cab95d316369cb101ccf5be8033c
Signed-off-by: Martin Sivak <msivak@redhat.com>