Merge branch 'ashift'

This branch adds some overdue ashift improvements.

• Add '-o ashift' to 'zpool add' and 'zpool attach'
• Improve AF hard disk detection
• Allow 'zpool import' to handle increases in ashift

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>