Changing thrift executable to 0.5
libthrift version to 0.5.0-cdh
adding protoc version to build with 2.5.0
Changing version of develop to 4.5-inm
Merge branch 'master' into develop