Merge branch 'raman/master_feeds' of https://code.google.com/p/hyracks into raman/master_feeds