Merge commit '955e80cd6ee8e52f0e14889d3bf2826adf1a0ade' into freenas10/merge-fix-three

Conflicts:
	src/gui/app/jsx/views/FreeNASWebApp.js
Hand merge bb34a672e7933bbb83da2b6ee8f15c50cf479c0d
Hand merge c484f48833ea23085dfd898418661fb6abf2f00f
Hand merge e14802ed265ca76adf915185556590903a40d759
Merge branch 'freenas10/merge-fix-three' into freebsd10

Conflicts:
	src/gui/app/source/styles/structure.less