Database password in archiva is not set due to order of definitions

Use inheritance
Upgrade maestro module