Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'