Move all our ix rc.d scripts to a separate directory
Add /etc/ix.rc.d to the local startup path
Stop gap solution for netcli in gui-nolicense
Add disk plugin to collectd
Add default nginx.conf

It will be replaced by ix-nginx one.
Merge remote-tracking branch 'upstream/master'
Consolidate NFS shares under one service block in avahi

Creating one NFS service block per NFS share is wrong.  Create one
service block with all of the shares listed in that service block.
The previous behavior caused avahi to bail out parsing the config file
past where the NFS service was defined.
Restart samba instead of reloading it.

In some cases samba needs a restart instead of a reload to
have changes take effect.  In particular nmbd reload does
not do the right thing when you change the samba netbios
name.

This probably fixes a long standing bug where samba name changes
don't take effect until after a reboot.

This probably introduces a new behavior where changing certain
samba settings causes a restart when it isn't strictly needed.
In the netatalk 3 world server name is derived from the system hostname.

This field is not hooked up to anything, and it has been decided that
if the AFP server name doesn't match the hostname it breaks mDNS
anyways, and this is AFP, so by definition a Mac thing.
Merge remote-tracking branch 'upstream/master'
Prove I actually know how to use here docs.
Change password and Auxiliary Groups in user form

Ticket: #3395
Merge remote-tracking branch 'upstream/master'
Add advanced TLS options to proftpd

Ticket: #1910
Fix field names for ssh key scan

Ticket:	#3401
Allow hostname to be edited inline in System Information screen

Ticket:	#3410
Peer secret should not be required

Ticket:	#3424
Fix factory reset since users refactor

Ticket:	#3425
Fix inverted logic to add sg3_utils

Reported by:	dwhite
Use loader hooks for branding.