Upgrade tool -- trailing spaces and includes with path prefix

As reported by Author at http://dev.opencascade.org/index.php?q=node/1136, current upgrade procedure needs to be corrected to:

- avoid removing trailing spaces at the end of lines in processed files (as this produces a lot of irrelevant diffs)

- recognize #include statements where class name is prefixed by some sub-directory, when forward declaration of Handle is converted to #include, to avoid incorrect substitution.

Example of the code:

~~~~~

#include <occt/Geom_Surface.hxx>

class Handle(Geom_Surface);

Q_OBJECT
slots:

~~~~~