FreeNAS/freenas 2e6c8f4src/middlewared/middlewared main.py, src/middlewared/middlewared/etc_files/local nslcd.conf inadyn.conf

Merge branch 'master' into freenas/12-devel
DeltaFile
+35-35src/middlewared/middlewared/main.py
+14-14src/middlewared/middlewared/plugins/jail.py
+9-7src/middlewared/middlewared/etc_files/local/apache24/Includes/webdav.conf
+8-0src/middlewared/middlewared/plugins/webdav.py
+5-2src/middlewared/middlewared/etc_files/local/nslcd.conf
+2-2src/middlewared/middlewared/plugins/disk.py
+1-1src/middlewared/middlewared/etc_files/local/inadyn.conf
+74-617 files

UnifiedSplitRaw