Squashed commit of the following:

commit d60e6122ecdcf26562b6d387d59904cc70b3e358
Author: Jared Jurkiewicz <jared.jurkiewicz@gmail.com>
Date:   Tue Jun 10 11:21:50 2014 -0400

    Fix issue with dojox/html/metrics and font size, fixes #18080

(cherry picked from commit 1a0ab88532883d8293f04e0ad3f0bd91a1433f29)