This change fixes issues pointed out in the last patch set of the
referenced change request.
Apart from that, 406 error code is removed from expected error codes,
as currently .*/portgroups.* resources do not return it.
Change-Id: Ib5fccb3a4d1d2c1c7dd1095b86199536db87da4c