Fix patch path after reorg of files into contrail subdirs
fix cassandra install on fresh build
merged dsetia