fixes #3105 - use untranslated string for PuppetCA state filter

(cherry picked from commit 9e84387ba9cb1b6ce42ffb8aa52f933607999edc)
fixes #4111 - Add image user data flag to API

(cherry picked from commit d21103bcf13b5981601be88330ce73dbe4a1ed77)
Fixes #6763 - Correctly choose autocomplete search scope for taxonomies depenant on controller

(cherry picked from commit 26ee3b1e4f526a3c3975a3640e868dda205b5850)