backout bug 1073317 because it broke puppet running at boot. r=bustage
Merge bustage fix.
Bug 1072465- Bump bash version on Ubuntu. r=dustin
Merging from default

changeset:   2314:8c787ddd2204
tag:         tip
parent:      2312:fd2fce5c3fb1
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Sep 29 11:33:41 2014 -0400
summary:     Bug 1072465- Bump bash version on Ubuntu. r=dustin
Bug 1074277 - manage check_ami.py by puppet. r=catlee
Merging from default

changeset:   2316:05106f2441d7
tag:         tip
parent:      2314:8c787ddd2204
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Sep 29 16:00:12 2014 -0400
summary:     Bug 1074277 - manage check_ami.py by puppet. r=catlee
Backout 05106f2441d7
Merging from default

changeset:   2318:eb361af56027
tag:         tip
parent:      2316:05106f2441d7
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Sep 29 20:36:35 2014 -0400
summary:     Backout 05106f2441d7
Bug 848513: Windows restrict Access to VNC ini file due to password hash; r=dustin
Merge default -> production