DS-1714 Fix new Bootstrap choose-file.jsp to work browers other than Firefox

In browsers other than Firefox the Upload button wasn't working. I believe because the html 'input' element was only wrapped by the span element for the icon, rather than the span element for the entire button.