Merge branch 'ceej/tiered-tests' of https://code.google.com/p/hyracks into ceej/tiered-tests