Merge branch 'candidate-6.0.4' into candidate-6.0.6

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/InstantCloud/AWS-Mods/AWSIncludes.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<sect2 id="FindAmazonKey">
+<sect2>
   <title>Find your Amazon Access Key ID and Secret Access Key</title>
 
   <para><orderedlist>