Fix changed arguments
Merge branch 'fix-memorycache-builds-on-harmattan'