BUG/API : tweaked how AnchoredSizeBar handles font properties

 - removed the explicit `prop` from
    `mpl_toolkits.axes_grid1.anchored_artists.AnchoredSizeBar`
 - pass `fontproperties` through to the base class in place of `prop`
 - if `prop` is not None and `fontproperties` is None, then use
   `prop` in place of `fontproperties`.
cleaned up rouge merge lines
Merge pull request #2951 from tacaswell/anchoredsizebox_text

BUG/API : tweaked how AnchoredSizeBar handles font properties