diff -Nru ubuntu-core-config-0.6.15+ppa6/debian/changelog ubuntu-core-config-0.6.15+ppa7/debian/changelog
--- ubuntu-core-config-0.6.15+ppa6/debian/changelog	2015-07-01 15:29:05.000000000 +0000
+++ ubuntu-core-config-0.6.15+ppa7/debian/changelog	2015-07-02 15:36:55.000000000 +0000
@@ -1,3 +1,10 @@
+ubuntu-core-config (0.6.15+ppa7) vivid; urgency=low
+
+  * remove usr/bin/snappy-apparmor-lp1460152 and service
+    no longer needed now that we have the upstream apparmor fix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Jul 2015 17:36:23 +0200
+
 ubuntu-core-config (0.6.15+ppa6) vivid; urgency=medium
 
   * Adding datasource config for azure.
diff -Nru ubuntu-core-config-0.6.15+ppa6/lib/systemd/system/snappy-workaround-apparmor.service ubuntu-core-config-0.6.15+ppa7/lib/systemd/system/snappy-workaround-apparmor.service
--- ubuntu-core-config-0.6.15+ppa6/lib/systemd/system/snappy-workaround-apparmor.service	2015-06-08 12:54:28.000000000 +0000
+++ ubuntu-core-config-0.6.15+ppa7/lib/systemd/system/snappy-workaround-apparmor.service	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# workaround LP: #1460152
-# 
-[Unit]
-Description=Workaround apparmor cacheing
-After=etc-writable.mount
-Before=ubuntu-snappy.frameworks-pre.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/snappy-apparmor-lp1460152
-
-[Install]
-WantedBy=multi-user.target
diff -Nru ubuntu-core-config-0.6.15+ppa6/usr/bin/snappy-apparmor-lp1460152 ubuntu-core-config-0.6.15+ppa7/usr/bin/snappy-apparmor-lp1460152
--- ubuntu-core-config-0.6.15+ppa6/usr/bin/snappy-apparmor-lp1460152	2015-06-05 17:12:48.000000000 +0000
+++ ubuntu-core-config-0.6.15+ppa7/usr/bin/snappy-apparmor-lp1460152	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# workaroudn for LP: #1460152
-#
-
-set -e
-
-. /lib/apparmor/functions
-
-# check each profile if the cache is out of sync (we can not use
-# the mtime here because the apparmor seems to be doing the
-# strictly great check on the mtime)
-for p in $(find "$PROFILES" -maxdepth 1 -type f); do
-    profile_md5=$(md5sum "$p")
-    cached_p="$(echo $p | sed "s#$PROFILES#$PROFILES_CACHE#")"
-    if [ ! -f "$cached_p" ]; then
-        continue
-    fi
-    profile_md5_marker="$cached_p.profile-md5sum"
-    cached_md5="$(cat "$profile_md5_marker" || true)"
-    if [ "$profile_md5" != "$cached_md5" ]; then
-        # remove, re-generate, update-md5 of cache
-        rm -f "$cached_p"
-        "$PARSER" --write-cache --replace "$p"
-        echo "$profile_md5" > "$profile_md5_marker"
-    fi
-done