Expanded out the roles and the security / firewall pieces.
Merge remote-tracking branch 'origin/master'