When executing the playbook with limits set, the scoping currently does not work quite as well as one would hope. This tightens it a bit more to ensure that it operates as expected. Change-Id: Ie043fca77d98ce55edb84547b06be0001d7311ea