Merge branches 'arm.2016.06.14a', 'clk.2016.06.14a' and 'power.2016.06.14a' into HEAD