type/default: escape spaces in filenames
inc/collectd.inc.php: don't group type instances when snmp + if_octets

The snmp plugin is saving if_octets this way:
<host>/snmp/if_octets-<port>.rrd

Where the interfaces plugin is saving if_octets with this structure:
<host>/interface-<port>/if_octets.rrd
inc/collectd.inc.php: typo
Merge remote-tracking branch 'pommi/master' into next
Fix for 'undefined index error' blocking image rendering