Switch slp-sa-test to using the Flags module.
Resync with trunk
Fix the nits