RXF_COUCH_PREFIX simplified
Merge remote-tracking branch 'origin/master'

Conflicts:
	rxf-server/src/main/java/rxf/server/BlobAntiPatternObject.java
a stray generify before branching