Merge "Log IOExceptions on update of project configuration" into stable-2.11