Union Queries move merge to historical
handle union query on realtime node
formatting
merge from master and resolve conflicts
merge from master and review comments
Merge pull request #830 from metamx/union-merge-on-historical

Union merge on historical