Merge pull request #1438 from RosettaCommons/orlypolo/fix-namespace-location Orlypolo/fix namespace location