Merge pull request #566 from edx/will/devstack-base-box

Set devstack base box to empanada release (RC)
Merge remote-tracking branch 'origin/master' into rc/empanada
Merge remote-tracking branch 'origin' into rc/empanada
Merge pull request #561 from edx/rc/empanada

Rc/empanada
Merge pull request #729 from edx/jarv/focaccia

Jarv/focaccia
Merge branch 'master' into release
Merge pull request #775 from edx/feanil/release-gugelhupf

Feanil/release gugelhupf
include mysql-client on jenkins server
Making it more readable
nginx redirect
Merge pull request #905 from edx/han/logrotate

Making common task main.yml more readable
install private requirements
moving task to remove identity to bottom of deploy.yml
Be able to paramatrize the admin subnets.
Merge pull request #910 from edx/jarv/install-private

Jarv/install private
Update bash script to use shining panda correctly.
Merge pull request #912 from edx/feanil/build_ami_update

Update bash script to use shining panda correctly.
re-enable ansible parameterization for build-ami
remove escapes
Merge pull request #913 from edx/derf/parameterize_ami_build_job

re-enable ansible parameterization for build-ami