am 05913cc9: (-s ours) am c6ea41ef: Merge changes...

am 05913cc9: (-s ours) am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e

* commit '05913cc9':
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config