Building control manufacturer Johnson Controls, a recent entrant to the energy storage market, has announced a US$20 billion takeover of security and fire protection firm Tyco as it looks to consolidate its offering in the smart building sector.