Merge branch 'ce-to-ee-2018-02-21' into 'master'

CE upstream - 2018-02-21 21:27 UTC

See merge request gitlab-org/gitlab-ee!4660

spec/javascripts/filtered_search/dropdown_user_spec.js

 import DropdownUtils from '~/filtered_search/dropdown_utils';
 import DropdownUser from '~/filtered_search/dropdown_user';
 import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
-
 import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys';
 
 describe('Dropdown User', () => {