OS-2207 openlldp should remove files before it installs
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec