https://github.com/bbfsdev/bbfs/issues/198

updating code as per code review : https://github.com/bbfsdev/bbfs/pull/205
Merge remote-tracking branch 'origin/Issue198' into Issue198

Conflicts:
	lib/content_server/remote_content.rb