Testing dependecy branch.

Change-Id: Icfcd8e00a074ae2487f2231e949063125cfea901
Implements: blueprint capability-type-persistence