Fixes bug 736488 - Accept short os names in search with elasticsearch.
Merge pull request #1247 from AdrianGaudebert/736488-os-short

Fixes bug 736488 - Accept short os names in search with elasticsearch.
fixes bug 870286 - superuser must now be specified by puppet per docs
Merge pull request #1256 from rhelmer/bug870286-specify-superuser-puppet

fixes bug 870286 - superuser must now be specified by puppet per docs