More cfi file fixes (auto-port to 72X as well)

More cfi file fixes (auto-port to 72X as well)

More py file syntax fixes as flagged by ConfDB parsing.