Added some changes related to cloud-api bootstrap protocol and resource extension