Uset some other ZFS flags we don't want to create pools with by default
Enable building the old AppCafe for the time being, we will ship with
it for 10.1, until we have time to stabilize the newer HTML5 version
Fix a bug setting local access to AppCafe web-utility
Improve replication logging and fix some timing issues connecting
to a ISCSI host
Merge remote-tracking branch 'upstream/master'