Tilovell/1370 manage packages page broken for bhuva

Retry - fixes #1370 without breaking scenario of #1646.