VP-297: Applied the work-around for FLUID-5151 that causes a menu button for captions not working as well as fixing a unit test. The switching on UIOptions template for html5 and non-html5 browsers is changed back to use demands block due to FLUID-5155.