Backport lang/erlang PLIST fixes from trunk.