Fixes bug 736488 - Accept short os names in search with elasticsearch.