diff --git a/api-ref/src/wadls/orchestration-api/src/v1/common.ent b/api-ref/src/wadls/orchestration-api/src/v1/common.ent
index c33625498..7f0b307ad 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/common.ent
+++ b/api-ref/src/wadls/orchestration-api/src/v1/common.ent
@@ -280,3 +280,27 @@
    </para>
 </wadl:doc>
 </param> '>
+<!ENTITY commonFaults '
+<response status="400" xmlns="http://wadl.dev.java.net/2009/02">
+<wadl:doc xmlns="http://docbook.org/ns/docbook" title="Bad Request"
+   xml:lang="EN" />
+</response>
+<response status="401" xmlns="http://wadl.dev.java.net/2009/02">
+<wadl:doc xmlns="http://docbook.org/ns/docbook" title="Unauthorized"
+   xml:lang="EN" />
+</response> '>
+<!ENTITY notFound '
+<response status="404" xmlns="http://wadl.dev.java.net/2009/02">
+<wadl:doc xmlns="http://docbook.org/ns/docbook" title="Not Found"
+   xml:lang="EN" />
+</response> '>
+<!ENTITY conflict '
+<response status="409" xmlns="http://wadl.dev.java.net/2009/02">
+<wadl:doc xmlns="http://docbook.org/ns/docbook" title="Conflict"
+   xml:lang="EN" />
+</response> '>
+<!ENTITY intServerErr '
+<response status="500" xmlns="http://wadl.dev.java.net/2009/02">
+<wadl:doc xmlns="http://docbook.org/ns/docbook" title="Internal Server Error"
+   xml:lang="EN" />
+</response> '>
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
index dd4f45e4c..28005bfbc 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
+++ b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
@@ -473,6 +473,8 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &intServerErr;
    </method>
    <method name="POST" id="stack_create">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -610,6 +612,9 @@
             </param>
          </representation>
       </response>
+      &commonFaults;
+      &conflict;
+      &intServerErr;
    </method>
    <method name="POST" id="stack_preview">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -779,6 +784,9 @@
             </param>
          </representation>
       </response>
+      &commonFaults;
+      &conflict;
+      &intServerErr;
    </method>
    <method name="POST" id="stack_adopt">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -865,6 +873,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &conflict;
+      &intServerErr;
    </method>
    <method name="POST" id="stack_action_suspend">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -998,6 +1009,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="GET" id="stack_show">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1015,6 +1029,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="GET" id="stack_template">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1032,6 +1049,9 @@
           </wadl:doc>
         </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="PUT" id="stack_update">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -1106,6 +1126,9 @@
          </representation>
       </request>
       <response status="202"/>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="DELETE" id="stack_delete">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -1115,6 +1138,9 @@
          </para>
       </wadl:doc>
       <response status="204"/>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="DELETE" id="stack_abandon">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1133,6 +1159,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="POST" id="stack_snapshot">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1296,6 +1325,9 @@
             Lists all available template versions.
          </para>
       </wadl:doc>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="GET" id="resource_type_list">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1312,6 +1344,7 @@
            </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
    </method>
    <method name="GET" id="resource_type_get">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -1333,6 +1366,7 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
    </method>
    <method name="GET" id="resource_type_template">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -1364,6 +1398,8 @@
           </wadl:doc>
         </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="GET" id="stack_resources_find">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1433,6 +1469,8 @@
           </wadl:doc>
         </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="GET" id="resource_show">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -1449,6 +1487,8 @@
           </wadl:doc>
         </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="GET" id="resource_metadata">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1573,6 +1613,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="GET" id="resource_event_list">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1652,6 +1695,8 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="GET" id="event_show">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1772,6 +1817,8 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="GET" id="software_config_show">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1789,6 +1836,8 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
    </method>
    <method name="DELETE" id="software_config_delete">
       <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -1816,6 +1865,9 @@
             </wadl:doc>
          </representation>
       </response>
+      &commonFaults;
+      &notFound;
+      &intServerErr;
    </method>
    <method name="GET" id="software_deployment_metadata">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"