TRUNK-4015: use subdirectory of config dir if warname not simply 'openmrs'

How about this?