this seems to have been re-committed as a conflict fixup,
but it had been removed on purpose by

commit 8c041824
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Tue Nov 25 13:39:28 2014 +0000

    all these ids and their associated resources were unnecessary

    Change-Id: I3f538668c9c5f1727b8cf49ab72fd5879e12f156

This reverts commit f43162b0.

Change-Id: I57514dcc9cd48c841620d4cb20d049ea8c55254e