Graph Widget inside a Surface Widget Positioning is wrong.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge remote-tracking branch 'remotes/origin/Graph_Position' into gh-pages
Merge remote-tracking branch 'remotes/origin/HIPIE_Graph' into gh-pages