Manual commit of D7 porting work so far. (Had a conflict in the .info file due to keyword expansion.)