Use singular variable name for the single content
Use singular variable name for the single content

Change-Id: I8541f0b1797f2b525d730a6f816aa3c4850a49ad

swiftstack/swift3-stackforge,tumf/swift3,stackforge/swift3,KoreaCloudObjectStorage/swift3,tumf/swift3,stackforge/swift3,KoreaCloudObjectStorage/swift3,swiftstack/swift3-stackforge