make compass install robust

Change-Id: Iab71a2df4c1bb16bd7d60d149bd86bcbac2d4511
Merge "make compass install robust" into dev/experimental