Merge "Make *AdminStateUp parameters consistent"