branch for creating branch for fusion 2.1


[SVN r40239]
updates for fusion 2.1

[SVN r40246]
updates

[SVN r40388]