Update elb.json model

This includes the ConnectionDraining param.
Merge branch 'elb-conn-drain' into develop

* elb-conn-drain:
  Update elb.json model