Rebased app secret proof
Fixed conflicts
Move app secret proof
Merge pull request #287 from SammyK/refactor-app-secret-proof

[4.1] Refactored app secret proof handling