Merge pull request #209 from ray-lee/DRYD-482

author Ray Lee <rhlee@berkeley.edu>

Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)

committer GitHub <noreply@github.com>

Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)
author Ray Lee <rhlee@berkeley.edu>
Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)
committer GitHub <noreply@github.com>
Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)
diff --cc services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
Simple merge
author	Ray Lee <rhlee@berkeley.edu>
	Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)
committer	GitHub <noreply@github.com>
	Wed, 2 Jan 2019 07:08:23 +0000 (23:08 -0800)