(merge from head) Fix incorrect placement of headers directly into includedir with system layout. Fix library names including toolset tag in system layout.