[40/38] Load all includes in aa-mergeprof ask_the_questions()

aa-mergeprof empties 'includes' when running reset_aa(). The result is
    KeyError: 'abstractions/newly_added_abstraction'
if an include file gets added because it isn't part of 'includes' at
this time. Note that you'll need to add another rule after adding the
include to trigger checking the includes for superfluous rules.


This fixes the regression found by Steve - which isn't really a
regression, "just" one more thing that got more visible with the new
code. Before, it was just an ill-addressed hasher that didn't complain ;-)


Acked-by: Steve Beattie <steve@nxnw.org>

utils/aa-mergeprof

@@ -251,6 +251,7 @@ class Merge(object):
         #print(other.aa)
 
         #Add the file-wide includes from the other profile to the user profile
+        apparmor.aa.loadincludes()
         done = False
 
         options = []