Use logging instead of print >> sys.stderr in more places.

Fix a syntax error I introduced.
Merge branch '93M2-DEMO' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas into 93M2-DEMO