don't force height if scale is given

If the scale attribute is given:

.. image:: developer-public-en.pdf
   :scale: 40

The scale parameter is actually ignored because the height is force set. This
commit fixes that.
Merge remote-tracking branch 'esc/fix_image_scale' into m
Format