am 37f7e245: am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev

* commit '37f7e24584b0a85adc6d699818e3e863c261e4ed':
  Support cluster-style installs for bundled apps.