Rename of elasticloadbalancing -> elb, updates from docteam
Merge branch 'EronHennessey-develop' into develop

* EronHennessey-develop:
  Rename of elasticloadbalancing -> elb, updates from docteam