Merge "Add generic Apache decoder for OpenStack"