OS-2511 Rsyslog Must include imfile Plugin
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec