Merge remote branch 'cloudant:3102-fixup-for-config_subscription'

This closes #12

Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>