Fix admin extension gives 500 when listing instances

Bug# 1210322

Change-Id: Ib2c5e3d43688f0bb002eefc1c1ca4d347aa71f3c
Merge "Fix admin extension gives 500 when listing instances"