Backport the upstream issue, https://issues.apache.org/jira/browse/ARTEMIS-2815 in our product lines.

Customer use case: The use case is that we have a queue with a Queue Filter and we need to update it, on updating it, with 7.7 it throws an NPE, this does NOT occur in 7.4, this is a regression that occured in 7.7.

Business Impact: Impact is we need to change a filter on a queue but cannot as such cannot deliver a business requirement change