Adds workaround for RAP bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=402521
Merge "Adds workaround for RAP bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=402521"