Merge "Fixes LP#921409 * Adds /servers filter tests * Re-ordered resource building in fixtures to improve   execution time"