Merge "Update boot classpath and system server profiles"