converting to c7 account, change apache common, support v4 to version 21