Diversity continues to rise among CFOs and CEOs, survey shows