Merge "Fix phpcs errors and warnings in includes/exception"