Merge "Add stable/lithium for capwap"