Fix and simplify fedora_release test
    
    Also simplify os_release a bit thanks to the improved spell_
    version_number.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>