MAP-311: work to get unit tests and deployment working with single persistence.xml