Fixes and additions to address bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=472756

Change-Id: I87840774df2b604fd9bffdbda9d3c1ba410a1493
6 files changed