Merge branch 'master' into 5905-duplicate-email-errors

spec/javascripts/dashboard_spec.js.es6

 /* eslint-disable */
 /*= require sidebar */
 /*= require jquery */
-/*= require jquery.cookie */
+/*= require js.cookie */
 /*= require lib/utils/text_utility */
 
 ((global) => {