Fixups for mer-3.1 merge, minor upstreamable fix to projectexplorer, orphaned sources removal