change for oops for newly created 7-current. Also, fix build for releases 5.[012]*
State Changed From-To: open->closed Committed, thanks!