Merge remote-tracking branch 'aronr/CSPACE-6329-A' into CSPACE-6168-REM-B

author Richard Millet <remillet@berkeley.edu>

Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)

committer Richard Millet <remillet@berkeley.edu>

Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)
author Richard Millet <remillet@berkeley.edu>
Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)
committer Richard Millet <remillet@berkeley.edu>
Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)
diff --cc services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Tue, 11 Mar 2014 22:45:56 +0000 (15:45 -0700)