#4227 in upstream repo
Add local provisioning step notes to EC2 pages (adapted with changes by mpdehaan).
Merge branch 'devel' of git://github.com/nextus/ansible into devel

Conflicts:
	lib/ansible/constants.py