Merge back from UAT 3.3.1.pre

Includes:
Bulk labellables action (uat 3.2)
Filter paper refactoring (uat 3.3)

Specs pass with MRI and JRuby