diff --git a/config/dev/jolokia-access.xml b/config/dev/jolokia-access.xml
new file mode 100644
index 00000000000..9b4acde8794
--- /dev/null
+++ b/config/dev/jolokia-access.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<restrict>
+    <http>
+        <method>post</method>
+        <method>get</method>
+    </http>
+
+    <commands>
+        <command>read</command>
+        <command>list</command>
+    </commands>
+
+    <!-- allow anyone to force a garbage collection -->
+    <allow>
+        <mbean>
+            <name>java.lang:type=Memory</name>
+            <operation>gc</operation>
+        </mbean>
+    </allow>
+
+    <!-- in case we ever end up using c3pio connection pooling, this example from the docs prevents the password being exported -->
+    <deny>
+        <mbean>
+            <name>com.mchange.v2.c3p0:type=PooledDataSource,*</name>
+            <attribute>properties</attribute>
+        </mbean>
+    </deny>
+
+</restrict>
diff --git a/node/src/test/resources/jolokia-access.xml b/config/test/jolokia-access.xml
similarity index 100%
rename from node/src/test/resources/jolokia-access.xml
rename to config/test/jolokia-access.xml
diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle
index 8a32701ee86..0e813bfbeb9 100644
--- a/samples/attachment-demo/build.gradle
+++ b/samples/attachment-demo/build.gradle
@@ -35,12 +35,12 @@ repositories {
 sourceSets {
     main {
         resources {
-            srcDir "config/dev"
+            srcDir "../../config/dev"
         }
     }
     test {
         resources {
-            srcDir "config/test"
+            srcDir "../../config/test"
         }
     }
     integrationTest {
diff --git a/samples/attachment-demo/config/dev/log4j2.xml b/samples/attachment-demo/config/dev/log4j2.xml
deleted file mode 100644
index 6bdd95c1414..00000000000
--- a/samples/attachment-demo/config/dev/log4j2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-
-    <Properties>
-        <Property name="log-path">logs</Property>
-        <Property name="log-name">node-${hostName}</Property>
-        <Property name="archive">${log-path}/archive</Property>
-    </Properties>
-
-    <ThresholdFilter level="trace"/>
-
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
-                </pattern>>
-            </PatternLayout>
-        </Console>
-
-        <!-- Will generate up to 10 log files for a given day. During every rollover it will delete
-             those that are older than 60 days, but keep the most recent 10 GB -->
-        <RollingFile name="RollingFile-Appender"
-                     fileName="${log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
-
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
-
-            <Policies>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-
-            <DefaultRolloverStrategy min="1" max="10">
-                <Delete basePath="${archive}" maxDepth="1">
-                    <IfFileName glob="${log-name}*.log.gz"/>
-                    <IfLastModified age="60d">
-                        <IfAny>
-                            <IfAccumulatedFileSize exceeds="10 GB"/>
-                        </IfAny>
-                    </IfLastModified>
-                </Delete>
-            </DefaultRolloverStrategy>
-
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Root>
-        <Logger name="com.r3corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Logger>
-    </Loggers>
-
-</Configuration>
diff --git a/samples/attachment-demo/config/test/log4j2.xml b/samples/attachment-demo/config/test/log4j2.xml
deleted file mode 100644
index 9abf5313bb3..00000000000
--- a/samples/attachment-demo/config/test/log4j2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
-                </pattern>>
-            </PatternLayout>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-        </Root>
-        <Logger name="com.r3corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-        </Logger>
-    </Loggers>
-</Configuration>
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index 4e3f9d12747..3fd0ee57f8f 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -33,12 +33,12 @@ repositories {
 sourceSets {
     main {
         resources {
-            srcDir "config/dev"
+            srcDir "../../config/dev"
         }
     }
     test {
         resources {
-            srcDir "config/test"
+            srcDir "../../config/test"
         }
     }
     integrationTest {
diff --git a/samples/irs-demo/config/dev/log4j2.xml b/samples/irs-demo/config/dev/log4j2.xml
deleted file mode 100644
index 34ba4d45a8d..00000000000
--- a/samples/irs-demo/config/dev/log4j2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-
-    <Properties>
-        <Property name="log-path">logs</Property>
-        <Property name="log-name">node-${hostName}</Property>
-        <Property name="archive">${log-path}/archive</Property>
-    </Properties>
-
-    <ThresholdFilter level="trace"/>
-
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
-                </pattern>>
-            </PatternLayout>
-        </Console>
-
-        <!-- Will generate up to 10 log files for a given day. During every rollover it will delete
-             those that are older than 60 days, but keep the most recent 10 GB -->
-        <RollingFile name="RollingFile-Appender"
-                     fileName="${log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
-
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
-
-            <Policies>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-
-            <DefaultRolloverStrategy min="1" max="10">
-                <Delete basePath="${archive}" maxDepth="1">
-                    <IfFileName glob="${log-name}*.log.gz"/>
-                    <IfLastModified age="60d">
-                        <IfAny>
-                            <IfAccumulatedFileSize exceeds="10 GB"/>
-                        </IfAny>
-                    </IfLastModified>
-                </Delete>
-            </DefaultRolloverStrategy>
-
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Root>
-        <Logger name="net.corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Logger>
-    </Loggers>
-
-</Configuration>
diff --git a/samples/irs-demo/config/test/log4j2.xml b/samples/irs-demo/config/test/log4j2.xml
deleted file mode 100644
index cd9926ca8c8..00000000000
--- a/samples/irs-demo/config/test/log4j2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
-                </pattern>>
-            </PatternLayout>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-        </Root>
-        <Logger name="net.corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-        </Logger>
-    </Loggers>
-</Configuration>
diff --git a/samples/simm-valuation-demo/src/main/resources/jolokia-access.xml b/samples/simm-valuation-demo/src/main/resources/jolokia-access.xml
new file mode 100644
index 00000000000..9b4acde8794
--- /dev/null
+++ b/samples/simm-valuation-demo/src/main/resources/jolokia-access.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<restrict>
+    <http>
+        <method>post</method>
+        <method>get</method>
+    </http>
+
+    <commands>
+        <command>read</command>
+        <command>list</command>
+    </commands>
+
+    <!-- allow anyone to force a garbage collection -->
+    <allow>
+        <mbean>
+            <name>java.lang:type=Memory</name>
+            <operation>gc</operation>
+        </mbean>
+    </allow>
+
+    <!-- in case we ever end up using c3pio connection pooling, this example from the docs prevents the password being exported -->
+    <deny>
+        <mbean>
+            <name>com.mchange.v2.c3p0:type=PooledDataSource,*</name>
+            <attribute>properties</attribute>
+        </mbean>
+    </deny>
+
+</restrict>
diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle
index 3658fdb2004..12202510622 100644
--- a/samples/trader-demo/build.gradle
+++ b/samples/trader-demo/build.gradle
@@ -33,12 +33,12 @@ repositories {
 sourceSets {
     main {
         resources {
-            srcDir "config/dev"
+            srcDir "../../config/dev"
         }
     }
     test {
         resources {
-            srcDir "config/test"
+            srcDir "../../config/test"
         }
     }
     integrationTest {
diff --git a/samples/trader-demo/config/dev/log4j2.xml b/samples/trader-demo/config/dev/log4j2.xml
deleted file mode 100644
index 6bdd95c1414..00000000000
--- a/samples/trader-demo/config/dev/log4j2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-
-    <Properties>
-        <Property name="log-path">logs</Property>
-        <Property name="log-name">node-${hostName}</Property>
-        <Property name="archive">${log-path}/archive</Property>
-    </Properties>
-
-    <ThresholdFilter level="trace"/>
-
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
-                </pattern>>
-            </PatternLayout>
-        </Console>
-
-        <!-- Will generate up to 10 log files for a given day. During every rollover it will delete
-             those that are older than 60 days, but keep the most recent 10 GB -->
-        <RollingFile name="RollingFile-Appender"
-                     fileName="${log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
-
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
-
-            <Policies>
-                <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-
-            <DefaultRolloverStrategy min="1" max="10">
-                <Delete basePath="${archive}" maxDepth="1">
-                    <IfFileName glob="${log-name}*.log.gz"/>
-                    <IfLastModified age="60d">
-                        <IfAny>
-                            <IfAccumulatedFileSize exceeds="10 GB"/>
-                        </IfAny>
-                    </IfLastModified>
-                </Delete>
-            </DefaultRolloverStrategy>
-
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Root>
-        <Logger name="com.r3corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="RollingFile-Appender"/>
-        </Logger>
-    </Loggers>
-
-</Configuration>
diff --git a/samples/trader-demo/config/test/log4j2.xml b/samples/trader-demo/config/test/log4j2.xml
deleted file mode 100644
index 9abf5313bb3..00000000000
--- a/samples/trader-demo/config/test/log4j2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info">
-    <Appenders>
-        <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout>
-                <pattern>
-                    [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
-                </pattern>>
-            </PatternLayout>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console-Appender"/>
-        </Root>
-        <Logger name="com.r3corda" level="info" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
-        </Logger>
-    </Loggers>
-</Configuration>