Merge "Modified site pom and docker config"