Fix XSSF vertical alignment being set to top when only horizontal alignment is set
Merge branch 'xssf-vertical-alignment-fix'