I'm running Patch 2.5.X and have Crafting Mat Storage, but no Armory.
# 1 May 12, 2017
# 2 May 12, 2017rnb3rd,
The armory is separate like the stash is and is not accessible from the character pane. It is also only available in Adventure mode and not Campaign. When you are in campaign mode you will be looking for a helmet icon on the map and a wardrobe when you are actually next to it in game.