Apply correct devstack patches for stable/juno

Change-Id: I6402929e6f1e76c16ac2b5758e6e6c5b431a7ded