OS-3017 assertion failed: feature_get_refcount != ENOTSUP
Merge branch 'joyent_release-20140515' into fa-release-20140521