Merging 3.3.0 role-based playbook and image building bits.