Added common buildpack steps
Removed unused var
Close PROXY-9 #resolved #fixed
Merging buildpack from development