Removed inclusion of framework.h and added Poco/String.h
Merge branch 'master' into 4.1-linux-build