Composite operation with only one member fails

I am trying to issue /deployment=foo:add as one step within a composite operation.
When the composite operation has more than one member, this works.
If it only has this one member operation, it fails with

{"outcome":"failed","failure-description":"No handler for operation add at address [(\"deployment\" => \"test.war\")]","rolled-back":true}

The failing upload test is in testUploadComposite2 - while all other combinations in that test class work.

http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=blob;f=modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java;h=b0d68eedc5553d3ad4adc8236aee6ea537a82092;hb=as7plugin#l299

The code in question used to work for a long time - I suspect the new-controller work to have broken it. I just checked against an AS7 version from June 16th and there it still works.