Refactored ap_config spec
Merge remote-tracking branch 'origin/feature/serverspec' into feature/serverspec