Closes #575 by requiring retrieveByName WAFs to be active.
Merge commit '11235d88724e33e27fa0dfb6ea2bed981817f947' into HEAD