Merge branch 'raman/master_feeds_ext' of https://code.google.com/p/asterixdb into raman/master_feeds_ext