Prevent merge debris being part of package
Prevent merge debris being part of package



Closes #2095.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2095
MOS_MIGRATED_REVID=140134289

katre/bazel,safarmer/bazel,dslomov/bazel-windows,perezd/bazel,meteorcloudy/bazel,snnn/bazel,ButterflyNetwork/bazel,meteorcloudy/bazel,aehlig/bazel,juhalindfors/bazel-patches,akira-baruah/bazel,zhexuany/bazel,aehlig/bazel,safarmer/bazel,aehlig/bazel,davidzchen/bazel,safarmer/bazel,snnn/bazel,snnn/bazel,akira-baruah/bazel,safarmer/bazel,hermione521/bazel,dropbox/bazel,kchodorow/bazel,katre/bazel,safarmer/bazel,akira-baruah/bazel,kchodorow/bazel,juhalindfors/bazel-patches,dropbox/bazel,Asana/bazel,kchodorow/bazel-1,variac/bazel,LuminateWireless/bazel,katre/bazel,werkt/bazel,variac/bazel,juhalindfors/bazel-patches,cushon/bazel,bazelbuild/bazel,juhalindfors/bazel-patches,kchodorow/bazel-1,bazelbuild/bazel,katre/bazel,perezd/bazel,zhexuany/bazel,mikelikespie/bazel,ButterflyNetwork/bazel,ulfjack/bazel,perezd/bazel,dslomov/bazel-windows,spxtr/bazel,perezd/bazel,davidzchen/bazel,Asana/bazel,kchodorow/bazel-1,kchodorow/bazel-1,davidzchen/bazel,bazelbuild/bazel,LuminateWireless/bazel,dslomov/bazel,cushon/bazel,bazelbuild/bazel,werkt/bazel,dslomov/bazel,kchodorow/bazel-1,cushon/bazel,ButterflyNetwork/bazel,ulfjack/bazel,davidzchen/bazel,juhalindfors/bazel-patches,kchodorow/bazel,damienmg/bazel,davidzchen/bazel,cushon/bazel,LuminateWireless/bazel,werkt/bazel,twitter-forks/bazel,akira-baruah/bazel,dropbox/bazel,hermione521/bazel,variac/bazel,dslomov/bazel-windows,damienmg/bazel,mikelikespie/bazel,mikelikespie/bazel,perezd/bazel,ulfjack/bazel,dropbox/bazel,snnn/bazel,hermione521/bazel,dropbox/bazel,Asana/bazel,LuminateWireless/bazel,twitter-forks/bazel,snnn/bazel,kchodorow/bazel,snnn/bazel,zhexuany/bazel,davidzchen/bazel,dslomov/bazel,juhalindfors/bazel-patches,dslomov/bazel,ulfjack/bazel,spxtr/bazel,dslomov/bazel-windows,zhexuany/bazel,meteorcloudy/bazel,werkt/bazel,dslomov/bazel,zhexuany/bazel,variac/bazel,dslomov/bazel,dropbox/bazel,spxtr/bazel,mikelikespie/bazel,meteorcloudy/bazel,variac/bazel,ulfjack/bazel,kchodorow/bazel,cushon/bazel,ulfjack/bazel,bazelbuild/bazel,dslomov/bazel-windows,kchodorow/bazel,akira-baruah/bazel,mikelikespie/bazel,twitter-forks/bazel,dslomov/bazel,meteorcloudy/bazel,katre/bazel,spxtr/bazel,perezd/bazel,LuminateWireless/bazel,ButterflyNetwork/bazel,meteorcloudy/bazel,werkt/bazel,variac/bazel,spxtr/bazel,akira-baruah/bazel,Asana/bazel,ButterflyNetwork/bazel,davidzchen/bazel,hermione521/bazel,Asana/bazel,katre/bazel,damienmg/bazel,snnn/bazel,aehlig/bazel,cushon/bazel,werkt/bazel,spxtr/bazel,twitter-forks/bazel,hermione521/bazel,zhexuany/bazel,juhalindfors/bazel-patches,safarmer/bazel,dslomov/bazel-windows,Asana/bazel,spxtr/bazel,ButterflyNetwork/bazel,ulfjack/bazel,damienmg/bazel,damienmg/bazel,kchodorow/bazel-1,hermione521/bazel,kchodorow/bazel,aehlig/bazel,aehlig/bazel,twitter-forks/bazel,variac/bazel,twitter-forks/bazel,twitter-forks/bazel,meteorcloudy/bazel,LuminateWireless/bazel,damienmg/bazel,mikelikespie/bazel,Asana/bazel,bazelbuild/bazel,damienmg/bazel,aehlig/bazel,perezd/bazel