Ninja: fix foreground flag broken by 8115
Merge branch 'cassandra-2.1' into trunk