Make dialog 'x' buttons work with Bootstrap 2
Fix more 'x' buttons
Merge pull request #4208 from adobe/nj/issue-4203

Make dialog 'x' buttons work with Bootstrap 2