QIIME 1.9.0 release candidate 1, redux

Contains the commits in #1814 and #1815.