incorporating TR into HiveODBC Excel topic
fixing merge contlict #1133
Merge pull request #1134 from mollybostic/master_0304

Master 0304