Merge changes I8031de0c,I390523b0

* changes:
  config.xml: Add configuration to enable/disable 80211AC
  config.xml: Add configuration to enable/disable ACS