[VOL-5031] Build and deploy voltha-onos for v2.12

makefiles/*
-----------
  o https://github.com/opencord/onf-make
  o Update to the latest library makefiles to support more lint targets.

VERSION
-------
  o Cosmetic dev version bump to triage build state.

Change-Id: Iaddd825c24afdfa13e99cfd46cfe887072016d0f
diff --git a/Makefile b/Makefile
index 3ff200a..2bf35e6 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##
-include $(MAKEDIR)/include.mk
+include config.mk
+include makefiles/include.mk
 
 # Variables
 VERSION                  ?= $(shell cat ./VERSION)
@@ -87,7 +88,7 @@
 docker-push: ## push to docker registy: use DOCKER_REGISTRY, DOCKER_REPOSITORY and DOCKER_TAG to customize
 	docker push ${ONOS_IMAGENAME}
 
-clean: ## clean the build environment
+clean :: ## clean the build environment
 	$(RM) -r local_imports
 
 # end file