Merge "Fix POM to allow HTTP long polling to work"