SPARK-1607. HOTFIX: Fix syntax adapting Int result to Short

Sorry folks. This should make the change for SPARK-1607 compile again. Verified this time with the yarn build enabled.